chrome/browser/extensions/page_action_apitest.cc - Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

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/page_action_apitest.cc

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

Index: chrome/browser/extensions/page_action_apitest.cc

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

--- chrome/browser/extensions/page_action_apitest.cc (revision 116109)

+++ chrome/browser/extensions/page_action_apitest.cc (working copy)

@@ -15,7 +15,7 @@

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

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

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

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

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

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {

ASSERT_TRUE(test_server()->Start());

@@ -41,7 +41,7 @@

// Simulate the page action being clicked.

ResultCatcher catcher;

int tab_id =

- ExtensionTabUtil::GetTabId(browser()->GetSelectedTabContents());

+ ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());

ExtensionService* service = browser()->profile()->GetExtensionService();

service->browser_event_router()->PageActionExecuted(

browser()->profile(), extension->id(), "", tab_id, "", 0);

@@ -69,7 +69,7 @@

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

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

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

ExtensionAction* page_action = extension->page_action();

ASSERT_TRUE(page_action)

@@ -115,7 +115,7 @@