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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/tabs/tab_strip_model_unittest.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/tabs/tab_strip_model_order_controller.cc ('k') | chrome/browser/translate/options_menu_model.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tabs/tab_strip_model_unittest.cc

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

--- chrome/browser/tabs/tab_strip_model_unittest.cc (revision 116232)

+++ chrome/browser/tabs/tab_strip_model_unittest.cc (working copy)

@@ -29,8 +29,8 @@

#include "chrome/common/url_constants.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/tab_contents.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_registrar.h"

@@ -640,7 +640,7 @@

// background with opener_contents set as their opener.

TabContentsWrapper* opener_contents = CreateTabContents();

- NavigationController* opener =

+ content::NavigationController* opener =

&opener_contents->tab_contents()->GetController();

tabstrip.AppendTabContents(opener_contents, true);

TabContentsWrapper* contents1 = CreateTabContents();

@@ -679,7 +679,8 @@

// For a tab that has opened no other tabs, the return value should always be

// -1...

- NavigationController* o1 = &contents1->tab_contents()->GetController();

+ content::NavigationController* o1 =

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

EXPECT_EQ(-1, tabstrip.GetIndexOfNextTabContentsOpenedBy(o1, 3, false));

EXPECT_EQ(-1, tabstrip.GetIndexOfLastTabContentsOpenedBy(o1, 3));

@@ -792,7 +793,7 @@

EXPECT_TRUE(tabstrip.empty());

TabContentsWrapper* opener_contents = CreateTabContents();

- NavigationController* opener =

+ content::NavigationController* opener =

&opener_contents->tab_contents()->GetController();

tabstrip.AppendTabContents(opener_contents, true);