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

Unified Diff: chrome/browser/notifications/notification_options_menu_model.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 2 Created 8 years, 7 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/notifications/notification_options_menu_model.cc
diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc
index 4a395952c7a0b02ce5a6329b6bbfa9f7ed2ac6d7..765b8ac330eb971909bf752376f64a291f70c772 100644
--- a/chrome/browser/notifications/notification_options_menu_model.cc
+++ b/chrome/browser/notifications/notification_options_menu_model.cc
@@ -123,7 +123,7 @@ NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon)
if (origin.SchemeIs(chrome::kExtensionScheme)) {
ExtensionService* extension_service =
balloon_->profile()->GetExtensionService();
- const Extension* extension =
+ const extensions::Extension* extension =
extension_service->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(origin));
// We get back no extension here when we show the notification after
@@ -175,7 +175,7 @@ string16 NotificationOptionsMenuModel::GetLabelForCommandId(int command_id)
if (origin.SchemeIs(chrome::kExtensionScheme)) {
ExtensionService* extension_service =
balloon_->profile()->GetExtensionService();
- const Extension* extension =
+ const extensions::Extension* extension =
extension_service->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(origin));
if (extension) {
@@ -233,14 +233,14 @@ void NotificationOptionsMenuModel::ExecuteCommand(int command_id) {
service->GrantPermission(origin);
break;
case kToggleExtensionCommand: {
- const Extension* extension =
+ const extensions::Extension* extension =
extension_service->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(origin));
if (extension) {
const std::string& id = extension->id();
if (extension_service->IsExtensionEnabled(id))
extension_service->DisableExtension(
- id, Extension::DISABLE_USER_ACTION);
+ id, extensions::Extension::DISABLE_USER_ACTION);
else
extension_service->EnableExtension(id);
}

Powered by Google App Engine
This is Rietveld 408576698