chrome/browser/ui/login/login_prompt_browsertest.cc - Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface.

Unified Diff: chrome/browser/ui/login/login_prompt_browsertest.cc

Issue 8956050: Rename TabContents::controller() to GetController and put it into the WebContents interface. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years 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/ui/login/login_prompt_browsertest.cc

===================================================================

--- chrome/browser/ui/login/login_prompt_browsertest.cc (revision 115228)

+++ chrome/browser/ui/login/login_prompt_browsertest.cc (working copy)

@@ -241,7 +241,7 @@

TabContentsWrapper* contents =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -267,7 +267,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -362,7 +362,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -414,7 +414,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -466,7 +466,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -537,7 +537,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -592,7 +592,7 @@

TabContentsWrapper* contents = browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

@@ -658,7 +658,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_1);

NavigationController* controller_1 =

- &contents_1->tab_contents()->controller();

+ &contents_1->tab_contents()->GetController();

// Open a new tab.

ui_test_utils::NavigateToURLWithDisposition(

@@ -673,7 +673,7 @@

ASSERT_TRUE(contents_2);

ASSERT_NE(contents_1, contents_2);

NavigationController* controller_2 =

- &contents_2->tab_contents()->controller();

+ &contents_2->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller_1));

@@ -726,7 +726,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_1);

NavigationController* controller_1 =

- &contents_1->tab_contents()->controller();

+ &contents_1->tab_contents()->GetController();

// Open a new tab.

ui_test_utils::NavigateToURLWithDisposition(

@@ -741,7 +741,7 @@

ASSERT_TRUE(contents_2);

ASSERT_NE(contents_1, contents_2);

NavigationController* controller_2 =

- &contents_2->tab_contents()->controller();

+ &contents_2->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller_1));

@@ -794,7 +794,7 @@

TabContentsWrapper* contents =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

- NavigationController* controller = &contents->tab_contents()->controller();

+ NavigationController* controller = &contents->tab_contents()->GetController();

// Open an incognito window.

Browser* browser_incognito = CreateIncognitoBrowser();

@@ -805,7 +805,7 @@

ASSERT_TRUE(contents_incognito);

ASSERT_NE(contents, contents_incognito);

NavigationController* controller_incognito =

- &contents_incognito->tab_contents()->controller();

+ &contents_incognito->tab_contents()->GetController();

LoginPromptBrowserTestObserver observer;

observer.Register(content::Source<NavigationController>(controller));

« no previous file with comments | « chrome/browser/ui/login/login_prompt.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »