| 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;
|
|
|