chrome/browser/extensions/api/extension_action/browser_action_apitest.cc - Issue 10535077: TabContentsWrapper -> TabContents, part 12.

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/extensions/api/extension_action/browser_action_apitest.cc

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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/extensions/api/cookies/cookies_helpers.cc ('k') | chrome/browser/extensions/api/extension_action/extension_actions_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

index 3eb8730b0b49fe2be46c1541ad4e6403ce6ae3ec..032b41f67f66a4e341f20db42329d869296b0b48 100644

--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {

service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);

// Verify the command worked.

- WebContents* tab = browser()->GetSelectedWebContents();

+ WebContents* tab = browser()->GetActiveWebContents();

bool result = false;

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

tab->GetRenderViewHost(), L"",

@@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) {

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());

+ int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());

ExtensionAction* browser_action = extension->browser_action();

ASSERT_TRUE(browser_action)