Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1455)

Unified Diff: chrome/browser/extensions/api/profile_keyed_api_factory.h

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile & deps Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/profile_keyed_api_factory.h
diff --git a/chrome/browser/extensions/api/profile_keyed_api_factory.h b/chrome/browser/extensions/api/profile_keyed_api_factory.h
index bddeea43624fbf9d31ddf68dc31725e59dc1f580..4cea7834cddc47a451a0d38da3eb6350ccc47677 100644
--- a/chrome/browser/extensions/api/profile_keyed_api_factory.h
+++ b/chrome/browser/extensions/api/profile_keyed_api_factory.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_
#include "chrome/browser/extensions/extension_system_factory.h"
+#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/browser/profiles/profile_keyed_service.h"
@@ -93,8 +94,12 @@ class ProfileKeyedAPIFactory : public ProfileKeyedServiceFactory {
// ProfileKeyedBaseFactory implementation.
// These can be effectively overridden with template specializations.
- virtual bool ServiceRedirectedInIncognito() const OVERRIDE {
- return T::kServiceRedirectedInIncognito;
+ virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* context) const OVERRIDE {
+ if (T::kServiceRedirectedInIncognito)
+ return chrome::GetBrowserContextRedirectedInIncognito(context);
+
+ return ProfileKeyedServiceFactory::GetBrowserContextToUse(context);
}
virtual bool ServiceIsCreatedWithProfile() const OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698