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/extensions/extension_navigation_observer.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/extensions/extension_navigation_observer.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_navigation_observer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc index d827f80..2cb1bc6 100644 --- a/chrome/browser/extensions/extension_navigation_observer.cc +++ b/chrome/browser/extensions/extension_navigation_observer.cc @@ -55,7 +55,7 @@ void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary( return; ExtensionService* extension_service = profile_->GetExtensionService(); - const Extension* extension = + const extensions::Extension* extension = extension_service->disabled_extensions()-> GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL())); if (!extension) @@ -80,7 +80,7 @@ void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary( void ExtensionNavigationObserver::InstallUIProceed() { ExtensionService* extension_service = profile_->GetExtensionService(); - const Extension* extension = extension_service->GetExtensionById( + const extensions::Extension* extension = extension_service->GetExtensionById( in_progress_prompt_extension_id_, true); NavigationController* nav_controller = in_progress_prompt_navigation_controller_; @@ -98,7 +98,7 @@ void ExtensionNavigationObserver::InstallUIProceed() { void ExtensionNavigationObserver::InstallUIAbort(bool user_initiated) { ExtensionService* extension_service = profile_->GetExtensionService(); - const Extension* extension = extension_service->GetExtensionById( + const extensions::Extension* extension = extension_service->GetExtensionById( in_progress_prompt_extension_id_, true); in_progress_prompt_extension_id_ = ""; |