chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - Issue 10534093: TabContentsWrapper -> TabContents, part 37.

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/browser_actions_controller.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (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:

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

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

index ccc35ddadb37f55b85c9fd9e9a8c2be41c31a7e6..6bccdbe95f8f0a3e39abddd391dba784ef244afc 100644

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

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

@@ -21,7 +21,7 @@

#import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"

#import "chrome/browser/ui/cocoa/image_button_cell.h"

#import "chrome/browser/ui/cocoa/menu_button.h"

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

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

#include "chrome/common/chrome_notification_types.h"

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

#include "chrome/common/pref_names.h"

@@ -841,7 +841,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,

}

- (int)currentTabId {

- TabContentsWrapper* selected_tab = browser_->GetSelectedTabContentsWrapper();

+ TabContents* selected_tab = browser_->GetActiveTabContents();

if (!selected_tab)

return -1;