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

Unified Diff: chrome/browser/instant/instant_loader.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/infobars/infobar_tab_helper.cc ('k') | chrome/browser/omnibox_search_hint.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.cc
===================================================================
--- chrome/browser/instant/instant_loader.cc (revision 116288)
+++ chrome/browser/instant/instant_loader.cc (working copy)
@@ -52,6 +52,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/codec/png_codec.h"
+using content::NavigationController;
using content::NavigationEntry;
using content::WebContents;
@@ -296,7 +297,7 @@
registrar_.Add(this, content::NOTIFICATION_INTERSTITIAL_ATTACHED,
content::Source<WebContents>(loader->preview_contents()->web_contents()));
registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&loader->preview_contents()->web_contents()->GetController()));
}
@@ -779,7 +780,7 @@
registrar_.Remove(
this,
content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&preview_contents_->web_contents()->GetController()));
#endif
}
@@ -999,13 +1000,13 @@
registrar_.Remove(
this,
content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&old_tc->web_contents()->GetController()));
#endif
registrar_.Remove(
this,
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&old_tc->web_contents()->GetController()));
// We prerendered so we should be ready to show. If we're ready, swap in
@@ -1045,14 +1046,14 @@
registrar_.Add(
this,
content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&preview_contents_->web_contents()->GetController()));
#endif
registrar_.Add(
this,
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&preview_contents_->web_contents()->GetController()));
gfx::Rect tab_bounds;
« no previous file with comments | « chrome/browser/infobars/infobar_tab_helper.cc ('k') | chrome/browser/omnibox_search_hint.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698