diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
| commit | 1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch) | |
| tree | bb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/notifications/notification_options_menu_model.cc | |
| parent | e2a374f50043586ff684e0720bbbd99b9aa15c07 (diff) | |
| download | chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2 | |
Move Extension into extensions namespace
BUG=117262
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10375021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification_options_menu_model.cc')
| -rw-r--r-- | chrome/browser/notifications/notification_options_menu_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index 33c1f00..b598ac8 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -124,7 +124,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 @@ -176,7 +176,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) { @@ -234,14 +234,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); } |