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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 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/extensions/extension_navigation_observer.cc
diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc
index d827f809d2639588ad594cc6a9c0ca2db2aff246..2cb1bc68fceab10bcc41017eacbcc1be55565501 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_ = "";
« no previous file with comments | « chrome/browser/extensions/extension_nacl_browsertest.cc ('k') | chrome/browser/extensions/extension_override_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698