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

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

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 years, 5 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/extension_management_api.cc
diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc
index df9fd2d5ef97237e6487c9ec20d0a0b6e30eea33..dac8e069cf480771cfe84be5b0922e232d7ad9eb 100644
--- a/chrome/browser/extensions/extension_management_api.cc
+++ b/chrome/browser/extensions/extension_management_api.cc
@@ -83,7 +83,7 @@ static DictionaryValue* CreateExtensionInfo(const Extension& extension,
info->SetBoolean(keys::kIsAppKey, extension.is_app());
if (!enabled) {
- ExtensionPrefs* prefs = service->extension_prefs();
+ extensions::ExtensionPrefs* prefs = service->extension_prefs();
bool permissions_escalated =
prefs->DidExtensionEscalatePermissions(extension.id());
const char* reason = permissions_escalated ?
@@ -361,7 +361,7 @@ bool LaunchAppFunction::RunImpl() {
// the user has not set a preference, we open the app in a tab.
extension_misc::LaunchContainer launch_container =
service()->extension_prefs()->GetLaunchContainer(
- extension, ExtensionPrefs::LAUNCH_DEFAULT);
+ extension, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
application_launch::OpenApplication(profile(), extension, launch_container,
GURL(), NEW_FOREGROUND_TAB, NULL);
#if !defined(OS_ANDROID)
@@ -401,7 +401,7 @@ bool SetEnabledFunction::RunImpl() {
bool currently_enabled = service()->IsExtensionEnabled(extension_id_);
if (!currently_enabled && enable) {
- ExtensionPrefs* prefs = service()->extension_prefs();
+ extensions::ExtensionPrefs* prefs = service()->extension_prefs();
if (prefs->DidExtensionEscalatePermissions(extension_id_)) {
if (!user_gesture()) {
error_ = keys::kGestureNeededForEscalationError;
« no previous file with comments | « chrome/browser/extensions/extension_font_settings_api.cc ('k') | chrome/browser/extensions/extension_management_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698