chrome/browser/ui/toolbar/toolbar_model_unittest.cc - Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers.

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/ui/toolbar/toolbar_model_unittest.cc

Issue 9085006: Replace Browser::GetTabContentsAt with GetWebContentsAt and update all callers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac yet again 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/panels/panel_window_controller_cocoa.mm ('k') | chrome/browser/ui/views/find_bar_host_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

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

--- chrome/browser/ui/toolbar/toolbar_model_unittest.cc (revision 116244)

+++ chrome/browser/ui/toolbar/toolbar_model_unittest.cc (working copy)

@@ -8,11 +8,12 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/toolbar/toolbar_model.h"

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

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

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

#include "content/public/common/url_constants.h"

using content::OpenURLParams;

using content::Referrer;

+using content::WebContents;

class ToolbarModelTest : public BrowserWithTestWindowTest {

public:

@@ -22,7 +23,7 @@

void NavigateAndCheckText(const std::string& url,

const std::string& expected_text,

bool should_display) {

- TabContents* contents = browser()->GetTabContentsAt(0);

+ WebContents* contents = browser()->GetWebContentsAt(0);

browser()->OpenURL(OpenURLParams(

GURL(url), Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,

false));