diff --git a/chrome/browser/ui/app_list/app_list_service_impl.cc b/chrome/browser/ui/app_list/app_list_service_impl.cc index 3808fee61706a..696eba71b7780 100644 --- a/chrome/browser/ui/app_list/app_list_service_impl.cc +++ b/chrome/browser/ui/app_list/app_list_service_impl.cc @@ -261,7 +261,7 @@ AppListServiceImpl::~AppListServiceImpl() {} AppListViewDelegate* AppListServiceImpl::GetViewDelegate(Profile* profile) { if (!view_delegate_) view_delegate_.reset(new AppListViewDelegate(GetControllerDelegate())); - view_delegate_->SetProfile(profile); + view_delegate_->SetProfile(profile->GetOriginalProfile()); return view_delegate_.get(); } diff --git a/chrome/browser/ui/app_list/start_page_service_factory.cc b/chrome/browser/ui/app_list/start_page_service_factory.cc index 95c1081e5d526..0e7c33f5fb03e 100644 --- a/chrome/browser/ui/app_list/start_page_service_factory.cc +++ b/chrome/browser/ui/app_list/start_page_service_factory.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "chrome/browser/extensions/install_tracker_factory.h" +#include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/start_page_service.h" #include "chrome/common/chrome_switches.h" @@ -49,4 +50,10 @@ KeyedService* StartPageServiceFactory::BuildServiceInstanceFor( return new StartPageService(profile); } +content::BrowserContext* StartPageServiceFactory::GetBrowserContextToUse( + content::BrowserContext* context) const { + // The start page service needs an instance in ChromeOS guest mode. + return chrome::GetBrowserContextRedirectedInIncognito(context); +} + } // namespace app_list diff --git a/chrome/browser/ui/app_list/start_page_service_factory.h b/chrome/browser/ui/app_list/start_page_service_factory.h index 5fd304dbe6ac5..1bd8031eda3a9 100644 --- a/chrome/browser/ui/app_list/start_page_service_factory.h +++ b/chrome/browser/ui/app_list/start_page_service_factory.h @@ -31,6 +31,8 @@ class StartPageServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const override; + content::BrowserContext* GetBrowserContextToUse( + content::BrowserContext* context) const override; DISALLOW_COPY_AND_ASSIGN(StartPageServiceFactory); };