chrome/browser/extensions/api/extension_action/page_as_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/page_as_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/extension_action/page_action_apitest.cc ('k') | chrome/browser/extensions/api/identity/identity_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 430596c815e756a94dc54805dba59342ba22e4d5..073138a6b7ba635cf198697858c06bcd30ab494f 100644

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

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

@@ -14,7 +14,7 @@

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

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

#include "chrome/browser/ui/omnibox/location_bar.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"

@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

}

// Test that we received the changes.

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

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

ExtensionAction* action = extension->browser_action();

ASSERT_TRUE(action);

EXPECT_EQ("Modified", action->GetTitle(tab_id));

@@ -104,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) {

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

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

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

ExtensionAction* page_action = extension->browser_action();

ASSERT_TRUE(page_action)

@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, RemovePopup) {

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

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

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

ExtensionAction* page_action = extension->browser_action();

ASSERT_TRUE(page_action)