chrome/browser/ui/views/browser_actions_container.cc - Issue 10540100: TabContentsWrapper -> TabContents, part 48.

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/views/browser_actions_container.cc

Issue 10540100: TabContentsWrapper -> TabContents, part 48. (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/views/browser_actions_container.cc

diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc

index bcb44dc9566a856faee22d09ba56149f81f21d4d..082e51395a3dd93f64ea306f72a842cf2bbd8af2 100644

--- a/chrome/browser/ui/views/browser_actions_container.cc

+++ b/chrome/browser/ui/views/browser_actions_container.cc

@@ -10,7 +10,7 @@

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

#include "chrome/browser/sessions/restore_tab_helper.h"

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

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

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

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

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

#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

@@ -128,7 +128,7 @@ void BrowserActionsContainer::Init() {

}

int BrowserActionsContainer::GetCurrentTabId() const {

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

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

return tab ? tab->restore_tab_helper()->session_id().id() : -1;

}