chrome/browser/extensions/extension_keybinding_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/extension_keybinding_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/extension_install_ui_default.cc ('k') | chrome/browser/extensions/extension_management_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_keybinding_apitest.cc

diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc

index b00097deb23bf6449d7cd770ffcaa680ff23779b..49509d7a79a270881ffe5a554ee69023d8b3e273 100644

--- a/chrome/browser/extensions/extension_keybinding_apitest.cc

+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc

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

#include "chrome/browser/extensions/browser_action_test_util.h"

#include "chrome/browser/sessions/restore_tab_helper.h"

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

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_action.h"

@@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, Basic) {

browser(), ui::VKEY_F, true, true, false, false));

// Verify the command worked.

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

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

bool result = false;

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

tab->GetRenderViewHost(), L"",

@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, PageAction) {

// Make sure it appears and is the right one.

ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));

- int tab_id = browser()->GetSelectedTabContentsWrapper()->

+ int tab_id = browser()->GetActiveTabContents()->

restore_tab_helper()->session_id().id();

ExtensionAction* action = extension->page_action();

ASSERT_TRUE(action);

@@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, PageAction) {