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

Unified Diff: chrome/browser/extensions/api/management/management_api.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup Created 6 years, 10 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/management/management_api.cc
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index da1e529f7e934d84f1ca7e3fa587ec7119c0b870..4e0c437dc1de5a3fdc6386d05aa106d39d803aa7 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -125,7 +125,7 @@ scoped_ptr<management::ExtensionInfo> CreateExtensionInfo(
if (info->enabled) {
info->disabled_reason = management::ExtensionInfo::DISABLED_REASON_NONE;
} else {
- ExtensionPrefs* prefs = service->extension_prefs();
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(service->profile());
if (prefs->DidExtensionEscalatePermissions(extension.id())) {
info->disabled_reason =
management::ExtensionInfo::DISABLED_REASON_PERMISSIONS_INCREASE;
@@ -439,7 +439,7 @@ bool ManagementLaunchAppFunction::RunImpl() {
// If the user has not set a preference, the default launch value will be
// returned.
LaunchContainer launch_container =
- GetLaunchContainer(service()->extension_prefs(), extension);
+ GetLaunchContainer(ExtensionPrefs::Get(service()->profile()), extension);
James Cook 2014/02/07 00:53:02 Can you use GetProfile() here instead of service()
Ken Rockot(use gerrit already) 2014/02/10 18:53:02 Done.
OpenApplication(AppLaunchParams(
GetProfile(), extension, launch_container, NEW_FOREGROUND_TAB));
#if !defined(OS_ANDROID)
@@ -484,7 +484,7 @@ bool ManagementSetEnabledFunction::RunImpl() {
bool currently_enabled = service()->IsExtensionEnabled(extension_id_);
if (!currently_enabled && params->enabled) {
- ExtensionPrefs* prefs = service()->extension_prefs();
+ ExtensionPrefs* prefs = ExtensionPrefs::Get(service()->profile());
James Cook 2014/02/07 00:53:02 ditto
Ken Rockot(use gerrit already) 2014/02/10 18:53:02 Done.
if (prefs->DidExtensionEscalatePermissions(extension_id_)) {
if (!user_gesture()) {
error_ = keys::kGestureNeededForEscalationError;

Powered by Google App Engine
This is Rietveld 408576698