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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 89253002: Remove ExtensionPrefFactory's dependency on Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 955e43f7d4f53155ad8a9d7ce384d62ec7aeccea..ed4cf34183a30fa76355697fc1277baf44472e6a 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -337,10 +337,9 @@ ExtensionService::ExtensionService(Profile* profile,
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Figure out if extension installation should be enabled.
- if (command_line->HasSwitch(switches::kDisableExtensions) ||
- profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
+ if (extensions::ExtensionsBrowserClient::Get()->AreExtensionsDisabled(
+ *command_line, profile))
extensions_enabled_ = false;
- }
registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
content::NotificationService::AllBrowserContextsAndSources());
« no previous file with comments | « chrome/browser/extensions/extension_prefs_factory.cc ('k') | chrome/browser/extensions/extension_sync_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698