summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.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/browser_focus_uitest.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/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 0ecab77..fc59670 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -853,8 +853,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
{
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+ content::Source<content::NavigationController>(
+ &browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
observer.Wait();
@@ -869,8 +869,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
{
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+ content::Source<content::NavigationController>(
+ &browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
observer.Wait();
@@ -892,8 +892,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnReloadCrashedTab) {
{
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<NavigationController>(
- &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
+ content::Source<content::NavigationController>(
+ &browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
browser()->Reload(CURRENT_TAB);
observer.Wait();