summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_navigation_observer.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 18:27:46 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 18:27:46 +0000
commitcca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2 (patch)
tree84e486002d42744cea34f59d1b83ab29a0dc5354 /chrome/browser/extensions/extension_navigation_observer.cc
parent2a3197bb6a8a4c6f3a7affadce28cda638906131 (diff)
downloadchromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.zip
chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.gz
chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.bz2
Convert all the notifications which use NavigationController to content::NavigationController. After this is done, we can then make WebContents return a content::NavigationEntry instead of the impl.
BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/9016047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_navigation_observer.cc')
-rw-r--r--chrome/browser/extensions/extension_navigation_observer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_navigation_observer.cc b/chrome/browser/extensions/extension_navigation_observer.cc
index 5fed51a..18a4edf 100644
--- a/chrome/browser/extensions/extension_navigation_observer.cc
+++ b/chrome/browser/extensions/extension_navigation_observer.cc
@@ -28,8 +28,8 @@ void ExtensionNavigationObserver::Observe(
return;
}
- NavigationController* controller =
- content::Source<NavigationController>(source).ptr();
+ content::NavigationController* controller =
+ content::Source<content::NavigationController>(source).ptr();
if (!profile_->IsSameProfile(
Profile::FromBrowserContext(controller->GetBrowserContext())))
return;
@@ -43,7 +43,7 @@ void ExtensionNavigationObserver::RegisterForNotifications() {
}
void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary(
- NavigationController* nav_controller) {
+ content::NavigationController* nav_controller) {
// Bail out if we're already running a prompt.
if (!in_progress_prompt_extension_id_.empty())
return;
@@ -80,7 +80,7 @@ void ExtensionNavigationObserver::InstallUIProceed() {
ExtensionService* extension_service = profile_->GetExtensionService();
const Extension* extension = extension_service->GetExtensionById(
in_progress_prompt_extension_id_, true);
- NavigationController* nav_controller =
+ content::NavigationController* nav_controller =
in_progress_prompt_navigation_controller_;
CHECK(extension);
CHECK(nav_controller);