chrome/browser/extensions/api/extension_action/browser_action_apitest.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/extensions/api/extension_action/browser_action_apitest.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/extensions/api/downloads/downloads_api_unittest.cc ('k') | chrome/browser/extensions/api/extension_action/page_action_apitest.cc » ('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

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

--- chrome/browser/extensions/api/extension_action/browser_action_apitest.cc (revision 145001)

+++ chrome/browser/extensions/api/extension_action/browser_action_apitest.cc (working copy)

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

#include "chrome/browser/profiles/profile.h"

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

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

@@ -81,7 +82,7 @@

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

// Verify the command worked.

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

+ WebContents* tab = chrome::GetActiveWebContents(browser());

bool result = false;

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

tab->GetRenderViewHost(), L"",

@@ -147,7 +148,7 @@

EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0));

// Go back to first tab, changed title should reappear.

- browser()->ActivateTabAt(0, true);

+ chrome::ActivateTabAt(browser(), 0, true);

EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0));

// Reload that tab, default title should come back.

@@ -197,7 +198,8 @@

const Extension* extension = GetSingleLoadedExtension();

ASSERT_TRUE(extension) << message_;

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

+ int tab_id = ExtensionTabUtil::GetTabId(

+ chrome::GetActiveWebContents(browser()));

ExtensionAction* browser_action = extension->browser_action();

ASSERT_TRUE(browser_action)

@@ -252,7 +254,8 @@