chrome/browser/ui/webui/options2/options_ui2_browsertest.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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/webui/options2/options_ui2_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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/webui/ntp/suggestions_combiner.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/options_ui2_browsertest.cc

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

--- chrome/browser/ui/webui/options2/options_ui2_browsertest.cc (revision 145001)

+++ chrome/browser/ui/webui/options2/options_ui2_browsertest.cc (working copy)

@@ -7,6 +7,7 @@

#include "base/string16.h"

#include "base/utf_string_conversions.h"

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

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

#include "chrome/common/url_constants.h"

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

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

@@ -27,7 +28,7 @@

void OptionsBrowserTest::VerifyNavbar() {

bool navbar_exist = false;

EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

- browser()->GetActiveWebContents()->GetRenderViewHost(),

+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

L"",

L"domAutomationController.send("

L"!!document.getElementById('navigation'))", &navbar_exist));

@@ -35,7 +36,7 @@

}

void OptionsBrowserTest::VerifyTitle() {

- string16 title = browser()->GetActiveWebContents()->GetTitle();

+ string16 title = chrome::GetActiveWebContents(browser())->GetTitle();

string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);

EXPECT_NE(title.find(expected_title), string16::npos);

}