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

Unified Diff: chrome/browser/speech/tts_extension_loader_chromeos.cc

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots 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/speech/tts_extension_loader_chromeos.cc
diff --git a/chrome/browser/speech/tts_extension_loader_chromeos.cc b/chrome/browser/speech/tts_extension_loader_chromeos.cc
index 6f7e3ae67d4bbdb825101008e6be0b025c506d63..71c1b6bf7cdf43d12601566f7fd6a5db038cdd00 100644
--- a/chrome/browser/speech/tts_extension_loader_chromeos.cc
+++ b/chrome/browser/speech/tts_extension_loader_chromeos.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.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"
@@ -41,10 +42,11 @@ class TtsExtensionLoaderChromeOsFactory : public ProfileKeyedServiceFactory {
virtual ~TtsExtensionLoaderChromeOsFactory() {}
- virtual bool ServiceRedirectedInIncognito() const OVERRIDE {
+ virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* context) const OVERRIDE{
// If given an incognito profile (including the Chrome OS login
// profile), share the service with the original profile.
- return true;
+ return chrome::GetBrowserContextRedirectedInIncognito(context);
}
virtual ProfileKeyedService* BuildServiceInstanceFor(
« no previous file with comments | « chrome/browser/speech/chrome_speech_recognition_preferences.cc ('k') | chrome/browser/spellchecker/spellcheck_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698