diff options
19 files changed, 45 insertions, 39 deletions
diff --git a/apps/app_keep_alive_service_factory.cc b/apps/app_keep_alive_service_factory.cc index dc9e725..c33452b 100644 --- a/apps/app_keep_alive_service_factory.cc +++ b/apps/app_keep_alive_service_factory.cc @@ -7,8 +7,8 @@ #include "apps/app_keep_alive_service.h" #include "apps/app_lifetime_monitor_factory.h" #include "apps/shell_window_registry.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extensions_browser_client.h" namespace apps { @@ -37,7 +37,8 @@ bool AppKeepAliveServiceFactory::ServiceIsCreatedWithBrowserContext() const { content::BrowserContext* AppKeepAliveServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } bool AppKeepAliveServiceFactory::ServiceIsNULLWhileTesting() const { diff --git a/apps/app_lifetime_monitor_factory.cc b/apps/app_lifetime_monitor_factory.cc index 1fb7994..7d37e4e 100644 --- a/apps/app_lifetime_monitor_factory.cc +++ b/apps/app_lifetime_monitor_factory.cc @@ -6,9 +6,9 @@ #include "apps/app_lifetime_monitor.h" #include "apps/shell_window_registry.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 { @@ -42,7 +42,8 @@ bool AppLifetimeMonitorFactory::ServiceIsCreatedWithBrowserContext() const { content::BrowserContext* AppLifetimeMonitorFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } } // namespace apps diff --git a/apps/shell_window_geometry_cache.cc b/apps/shell_window_geometry_cache.cc index 8be592f..09ad3b3 100644 --- a/apps/shell_window_geometry_cache.cc +++ b/apps/shell_window_geometry_cache.cc @@ -15,6 +15,7 @@ #include "content/public/browser/notification_types.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" namespace { @@ -319,7 +320,8 @@ bool ShellWindowGeometryCache::Factory::ServiceIsNULLWhileTesting() const { content::BrowserContext* ShellWindowGeometryCache::Factory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } void ShellWindowGeometryCache::AddObserver(Observer* observer) { diff --git a/apps/shell_window_registry.cc b/apps/shell_window_registry.cc index b72c131..093263b 100644 --- a/apps/shell_window_registry.cc +++ b/apps/shell_window_registry.cc @@ -6,7 +6,6 @@ #include "apps/shell_window.h" #include "apps/shell_window_registry.h" #include "apps/ui/native_app_window.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/devtools_agent_host.h" @@ -15,6 +14,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" namespace { @@ -302,7 +302,8 @@ bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const { content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } } // namespace extensions diff --git a/chrome/browser/apps/ephemeral_app_service_factory.cc b/chrome/browser/apps/ephemeral_app_service_factory.cc index b99cc27..b4115ab 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.cc +++ b/chrome/browser/apps/ephemeral_app_service_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/apps/ephemeral_app_service.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" using extensions::ExtensionSystemFactory; @@ -41,7 +41,8 @@ BrowserContextKeyedService* EphemeralAppServiceFactory::BuildServiceInstanceFor( content::BrowserContext* EphemeralAppServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } bool EphemeralAppServiceFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/apps/per_app_settings_service_factory.cc b/chrome/browser/apps/per_app_settings_service_factory.cc index b881e80..a750629 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.cc +++ b/chrome/browser/apps/per_app_settings_service_factory.cc @@ -6,8 +6,8 @@ #include "base/memory/singleton.h" #include "chrome/browser/apps/per_app_settings_service.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extensions_browser_client.h" // static PerAppSettingsServiceFactory* PerAppSettingsServiceFactory::GetInstance() { @@ -42,5 +42,6 @@ bool PerAppSettingsServiceFactory::ServiceIsCreatedWithBrowserContext() const { content::BrowserContext* PerAppSettingsServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index b0cd4c2..6fc0236 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc @@ -25,7 +25,6 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" @@ -332,7 +331,7 @@ BrowserContextKeyedService* ActivityLogFactory::BuildServiceInstanceFor( content::BrowserContext* ActivityLogFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } ActivityLogFactory::ActivityLogFactory() diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api_factory.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api_factory.cc index aef3874..78b81be 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api_factory.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/extensions/api/autotest_private/autotest_private_api.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 extensions { @@ -40,7 +40,7 @@ BrowserContextKeyedService* AutotestPrivateAPIFactory::BuildServiceInstanceFor( content::BrowserContext* AutotestPrivateAPIFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool AutotestPrivateAPIFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api_factory.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api_factory.cc index 71a3a4b..60521be 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api_factory.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.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 extensions { @@ -40,7 +40,7 @@ BrowserContextKeyedService* BluetoothAPIFactory::BuildServiceInstanceFor( content::BrowserContext* BluetoothAPIFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool BluetoothAPIFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_factory.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_factory.cc index f365430..2c24bec 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api_factory.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/extensions/api/developer_private/developer_private_api.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 extensions { @@ -41,7 +41,7 @@ BrowserContextKeyedService* DeveloperPrivateAPIFactory::BuildServiceInstanceFor( content::BrowserContext* DeveloperPrivateAPIFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool DeveloperPrivateAPIFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.cc b/chrome/browser/extensions/api/idle/idle_manager_factory.cc index 1bd7c51..8cfd28c 100644 --- a/chrome/browser/extensions/api/idle/idle_manager_factory.cc +++ b/chrome/browser/extensions/api/idle/idle_manager_factory.cc @@ -6,9 +6,9 @@ #include "chrome/browser/extensions/api/idle/idle_manager.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 extensions { @@ -43,7 +43,7 @@ BrowserContextKeyedService* IdleManagerFactory::BuildServiceInstanceFor( content::BrowserContext* IdleManagerFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool IdleManagerFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc index b796f10..f22ff99 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc @@ -7,9 +7,9 @@ #include "chrome/browser/extensions/api/networking_private/networking_private_event_router.h" #include "chrome/browser/extensions/api/networking_private/networking_private_service_client_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 extensions { @@ -48,7 +48,7 @@ NetworkingPrivateEventRouterFactory::BuildServiceInstanceFor( content::BrowserContext* NetworkingPrivateEventRouterFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool NetworkingPrivateEventRouterFactory:: diff --git a/chrome/browser/extensions/api/runtime/runtime_api_factory.cc b/chrome/browser/extensions/api/runtime/runtime_api_factory.cc index 5cdb49b..395bf8d 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api_factory.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api_factory.cc @@ -6,8 +6,8 @@ #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -41,7 +41,7 @@ BrowserContextKeyedService* RuntimeAPIFactory::BuildServiceInstanceFor( content::BrowserContext* RuntimeAPIFactory::GetBrowserContextToUse( content::BrowserContext* context) const { // Instance is shared between incognito and regular profiles. - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool RuntimeAPIFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc index d44607f..a90dad4 100644 --- a/chrome/browser/extensions/extension_action_manager.cc +++ b/chrome/browser/extensions/extension_action_manager.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/extension_action/page_action_handler.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" @@ -52,7 +52,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory { virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } }; diff --git a/chrome/browser/extensions/extension_sync_service_factory.cc b/chrome/browser/extensions/extension_sync_service_factory.cc index 1e8629c..e72a58d 100644 --- a/chrome/browser/extensions/extension_sync_service_factory.cc +++ b/chrome/browser/extensions/extension_sync_service_factory.cc @@ -7,11 +7,11 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/extension_sync_service.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/extension_prefs_factory.h" #include "extensions/browser/extension_system.h" +#include "extensions/browser/extensions_browser_client.h" // static ExtensionSyncService* ExtensionSyncServiceFactory::GetForProfile( @@ -47,5 +47,6 @@ BrowserContextKeyedService* content::BrowserContext* ExtensionSyncServiceFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.cc b/chrome/browser/extensions/extension_toolbar_model_factory.cc index 3f725a3..79ab80f 100644 --- a/chrome/browser/extensions/extension_toolbar_model_factory.cc +++ b/chrome/browser/extensions/extension_toolbar_model_factory.cc @@ -5,11 +5,11 @@ #include "chrome/browser/extensions/extension_toolbar_model_factory.h" #include "chrome/browser/extensions/extension_toolbar_model.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/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" +#include "extensions/browser/extensions_browser_client.h" // static ExtensionToolbarModel* ExtensionToolbarModelFactory::GetForProfile( @@ -42,7 +42,8 @@ BrowserContextKeyedService* content::BrowserContext* ExtensionToolbarModelFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return extensions::ExtensionsBrowserClient::Get()-> + GetOriginalContext(context); } bool ExtensionToolbarModelFactory::ServiceIsCreatedWithBrowserContext() const { diff --git a/chrome/browser/extensions/image_loader_factory.cc b/chrome/browser/extensions/image_loader_factory.cc index bc9c299..9181670 100644 --- a/chrome/browser/extensions/image_loader_factory.cc +++ b/chrome/browser/extensions/image_loader_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/image_loader_factory.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -41,9 +41,7 @@ bool ImageLoaderFactory::ServiceIsCreatedWithBrowserContext() const { content::BrowserContext* ImageLoaderFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - // TODO(jamescook): Find a more generic way to do this in the extensions - // system without being tied to Chrome code. - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } } // namespace extensions diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc index 799b3ab..9754f6c 100644 --- a/chrome/browser/extensions/install_tracker_factory.cc +++ b/chrome/browser/extensions/install_tracker_factory.cc @@ -8,10 +8,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker.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/extension_system.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -47,7 +47,7 @@ content::BrowserContext* InstallTrackerFactory::GetBrowserContextToUse( content::BrowserContext* context) const { // The installs themselves are routed to the non-incognito profile and so // should the install progress. - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } } // namespace extensions diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc index 1fc4aa1..cb8ec59 100644 --- a/chrome/browser/extensions/menu_manager_factory.cc +++ b/chrome/browser/extensions/menu_manager_factory.cc @@ -6,10 +6,10 @@ #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.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/extension_system.h" +#include "extensions/browser/extensions_browser_client.h" namespace extensions { @@ -45,7 +45,7 @@ BrowserContextKeyedService* content::BrowserContext* MenuManagerFactory::GetBrowserContextToUse( content::BrowserContext* context) const { - return chrome::GetBrowserContextRedirectedInIncognito(context); + return ExtensionsBrowserClient::Get()->GetOriginalContext(context); } bool MenuManagerFactory::ServiceIsCreatedWithBrowserContext() const { |