summaryrefslogtreecommitdiffstats
path: root/apps/app_load_service_factory.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-07 03:45:58 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-07 03:45:58 +0000
commitda762a83c3a3bdc03d5bf70cdd15801feb9dff62 (patch)
tree6f7894e30d8de920b4bc8d864e76e0127e94cf1c /apps/app_load_service_factory.cc
parent7eb7dc48d05847d7dcd2165d19562cbb11eaa201 (diff)
downloadchromium_src-da762a83c3a3bdc03d5bf70cdd15801feb9dff62.zip
chromium_src-da762a83c3a3bdc03d5bf70cdd15801feb9dff62.tar.gz
chromium_src-da762a83c3a3bdc03d5bf70cdd15801feb9dff62.tar.bz2
Add ExtensionsBrowserClient and AppSorting to app_shell
This lets it run a little further when attempting to run an app. BUG=None TEST=None Review URL: https://codereview.chromium.org/106033002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_load_service_factory.cc')
-rw-r--r--apps/app_load_service_factory.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_load_service_factory.cc b/apps/app_load_service_factory.cc
index a68cf94..a296d34 100644
--- a/apps/app_load_service_factory.cc
+++ b/apps/app_load_service_factory.cc
@@ -8,9 +8,9 @@
#include "apps/shell_window_registry.h"
#include "chrome/browser/extensions/extension_prefs_factory.h"
#include "chrome/browser/extensions/extension_system_factory.h"
-#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+#include "extensions/browser/extensions_browser_client.h"
namespace apps {
@@ -51,7 +51,9 @@ bool AppLoadServiceFactory::ServiceIsCreatedWithBrowserContext() const {
content::BrowserContext* AppLoadServiceFactory::GetBrowserContextToUse(
content::BrowserContext* context) const {
- return chrome::GetBrowserContextRedirectedInIncognito(context);
+ // Redirected in incognito.
+ return extensions::ExtensionsBrowserClient::Get()->
+ GetOriginalContext(context);
}
} // namespace apps