chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm - 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/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

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/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

index d3c8cf0f5b111783b0855486d7e5e0394a37c979..214b410120e96d6e6f1a696945221546102bd172 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

@@ -16,11 +16,11 @@

#include "chrome/browser/prefs/pref_service.h"

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

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

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

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

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

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

#include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

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

#include "chrome/common/chrome_paths.h"

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

#include "chrome/common/pref_names.h"

@@ -45,7 +45,8 @@ public:

action_ = action_manager->GetPageAction(*extension_);

EXPECT_TRUE(action_);

- content::WebContents* contents = chrome::GetActiveWebContents(browser());

+ content::WebContents* contents =

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

action_->SetAppearance(ExtensionTabUtil::GetTabId(contents),

ExtensionAction::ACTIVE);