chrome/browser/ui/login/login_prompt_browsertest.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

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

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac 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/ui/login/login_prompt.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/login/login_prompt_browsertest.cc

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

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

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

@@ -168,7 +168,7 @@

class WindowedLoadStopObserver

: public WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP> {

public:

- WindowedLoadStopObserver(NavigationController* controller,

+ WindowedLoadStopObserver(content::NavigationController* controller,

int notification_count)

: WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP>(controller),

remaining_notification_count_(notification_count) {}

@@ -244,7 +244,8 @@

TabContentsWrapper* contents =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -271,7 +272,8 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -370,7 +372,8 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -423,7 +426,8 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -476,7 +480,8 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -548,7 +553,8 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -605,7 +611,8 @@

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

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

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

@@ -672,7 +679,7 @@

TabContentsWrapper* contents_1 =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_1);

- NavigationController* controller_1 =

+ content::NavigationController* controller_1 =

&contents_1->web_contents()->GetController();

// Open a new tab.

@@ -687,7 +694,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_2);

ASSERT_NE(contents_1, contents_2);

- NavigationController* controller_2 =

+ content::NavigationController* controller_2 =

&contents_2->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

@@ -742,7 +749,7 @@

TabContentsWrapper* contents_1 =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_1);

- NavigationController* controller_1 =

+ content::NavigationController* controller_1 =

&contents_1->web_contents()->GetController();

// Open a new tab.

@@ -757,7 +764,7 @@

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_2);

ASSERT_NE(contents_1, contents_2);

- NavigationController* controller_2 =

+ content::NavigationController* controller_2 =

&contents_2->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;

@@ -813,7 +820,8 @@

TabContentsWrapper* contents =

browser()->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents);

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

+ content::NavigationController* controller =

+ &contents->web_contents()->GetController();

// Open an incognito window.

Browser* browser_incognito = CreateIncognitoBrowser();

@@ -823,7 +831,7 @@

browser_incognito->GetSelectedTabContentsWrapper();

ASSERT_TRUE(contents_incognito);

ASSERT_NE(contents, contents_incognito);

- NavigationController* controller_incognito =

+ content::NavigationController* controller_incognito =

&contents_incognito->web_contents()->GetController();

LoginPromptBrowserTestObserver observer;