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

Unified Diff: chrome/browser/extensions/api/preference/preference_api.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years, 1 month 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/preference/preference_api.cc
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 08c996c50ed2bef6f3b6b699d60cc1bd33eced23..fc480977fbb4c092183cc000a16b4a00c00d7ba3 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_prefs_scope.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
@@ -275,7 +276,8 @@ void PreferenceEventRouter::OnPrefChanged(PrefServiceBase* pref_service,
const PrefServiceBase::Preference* pref =
pref_service->FindPreference(browser_pref.c_str());
CHECK(pref);
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
PrefTransformerInterface* transformer =
PrefMapping::GetInstance()->FindTransformerForBrowserPref(browser_pref);
Value* transformed_value =
@@ -372,7 +374,8 @@ bool GetPreferenceFunction::RunImpl() {
// Retrieve incognito status.
if (incognito) {
extensions::ExtensionPrefs* ep =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
result->SetBoolean(keys::kIncognitoSpecific,
ep->HasIncognitoPrefValue(browser_pref));
}
@@ -432,7 +435,8 @@ bool SetPreferenceFunction::RunImpl() {
if (!ValidateBrowserPref(pref_key, &browser_pref))
return false;
extensions::ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
const PrefService::Preference* pref =
prefs->pref_service()->FindPreference(browser_pref.c_str());
CHECK(pref);
@@ -508,7 +512,8 @@ bool ClearPreferenceFunction::RunImpl() {
return false;
extensions::ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698