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

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

Issue 8983012: Get rid of content::NavigationController in cc file and use "using" instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 12 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
===================================================================
--- chrome/browser/extensions/extension_navigation_observer.cc (revision 116288)
+++ chrome/browser/extensions/extension_navigation_observer.cc (working copy)
@@ -10,6 +10,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
+using content::NavigationController;
using content::NavigationEntry;
ExtensionNavigationObserver::ExtensionNavigationObserver(Profile* profile)
@@ -28,8 +29,8 @@
return;
}
- content::NavigationController* controller =
- content::Source<content::NavigationController>(source).ptr();
+ NavigationController* controller =
+ content::Source<NavigationController>(source).ptr();
if (!profile_->IsSameProfile(
Profile::FromBrowserContext(controller->GetBrowserContext())))
return;
@@ -43,7 +44,7 @@
}
void ExtensionNavigationObserver::PromptToEnableExtensionIfNecessary(
- content::NavigationController* nav_controller) {
+ NavigationController* nav_controller) {
// Bail out if we're already running a prompt.
if (!in_progress_prompt_extension_id_.empty())
return;
@@ -80,7 +81,7 @@
ExtensionService* extension_service = profile_->GetExtensionService();
const Extension* extension = extension_service->GetExtensionById(
in_progress_prompt_extension_id_, true);
- content::NavigationController* nav_controller =
+ NavigationController* nav_controller =
in_progress_prompt_navigation_controller_;
CHECK(extension);
CHECK(nav_controller);
« no previous file with comments | « chrome/browser/extensions/extension_crash_recovery_browsertest.cc ('k') | chrome/browser/extensions/extension_tabs_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698