chrome/browser/extensions/api/extension_action/script_badge_apitest.cc - Issue 12066003: Remove TabStripModel wrapper use.

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

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gtk Created 7 years, 11 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/web_navigation/web_navigation_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2cd19df0abc0977bc4d7e76a6bb8732dab34fc6f..959874cf2237ed57217d14779166825868dcb634 100644

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

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

@@ -12,7 +12,7 @@

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

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

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

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

+#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/extensions/features/feature.h"

@@ -50,11 +50,11 @@ IN_PROC_BROWSER_TEST_F(ScriptBadgeApiTest, Basics) {

ASSERT_TRUE(script_badge);

const extensions::LocationBarController* location_bar_controller =

extensions::TabHelper::FromWebContents(

- chrome::GetActiveWebContents(browser()))->

+ browser()->tab_strip_model()->GetActiveWebContents())->

location_bar_controller();

const int tab_id = SessionID::IdForTab(

- chrome::GetActiveWebContents(browser()));

+ browser()->tab_strip_model()->GetActiveWebContents());

EXPECT_EQ(GURL(extension->GetResourceURL("default_popup.html")),

script_badge->GetPopupUrl(tab_id));