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

Unified Diff: chrome/browser/google/google_url_tracker.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
« no previous file with comments | « chrome/browser/geolocation/geolocation_browsertest.cc ('k') | chrome/browser/history/top_sites.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_url_tracker.cc
===================================================================
--- chrome/browser/google/google_url_tracker.cc (revision 116288)
+++ chrome/browser/google/google_url_tracker.cc (working copy)
@@ -32,6 +32,7 @@
#include "net/url_request/url_request_status.h"
#include "ui/base/l10n/l10n_util.h"
+using content::NavigationController;
using content::OpenURLParams;
using content::Referrer;
using content::WebContents;
@@ -323,8 +324,8 @@
const content::NotificationDetails& details) {
switch (type) {
case content::NOTIFICATION_NAV_ENTRY_PENDING: {
- content::NavigationController* controller =
- content::Source<content::NavigationController>(source).ptr();
+ NavigationController* controller =
+ content::Source<NavigationController>(source).ptr();
OnNavigationPending(source, controller->GetPendingEntry()->GetURL());
break;
}
@@ -332,7 +333,7 @@
case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
case content::NOTIFICATION_TAB_CLOSED:
OnNavigationCommittedOrTabClosed(
- content::Source<content::NavigationController>(source).ptr()->
+ content::Source<NavigationController>(source).ptr()->
GetWebContents(), type);
break;
@@ -358,16 +359,16 @@
void GoogleURLTracker::OnNavigationPending(
const content::NotificationSource& source,
const GURL& pending_url) {
- controller_ = content::Source<content::NavigationController>(source).ptr();
+ controller_ = content::Source<NavigationController>(source).ptr();
search_url_ = pending_url;
registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
content::NotificationService::AllSources());
// Start listening for the commit notification. We also need to listen for the
// tab close command since that means the load will never commit.
registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- content::Source<content::NavigationController>(controller_));
+ content::Source<NavigationController>(controller_));
registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
- content::Source<content::NavigationController>(controller_));
+ content::Source<NavigationController>(controller_));
}
void GoogleURLTracker::OnNavigationCommittedOrTabClosed(
« no previous file with comments | « chrome/browser/geolocation/geolocation_browsertest.cc ('k') | chrome/browser/history/top_sites.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698