chrome/browser/ui/views/browser_actions_container.cc - Issue 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it.

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 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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 2df4fd20f6f453718cf3f2014651e4043ea5b5c6..6cd8e2bf1338e20aa48b20d22a46a88ec4616483 100644

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

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

@@ -8,7 +8,7 @@

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

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

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

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

+#include "chrome/browser/sessions/session_tab_helper.h"

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

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

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

@@ -457,7 +457,7 @@ void BrowserActionsContainer::OnWidgetClosing(views::Widget* widget) {

int BrowserActionsContainer::GetCurrentTabId() const {

TabContents* tab = chrome::GetActiveTabContents(browser_);

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

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

}

void BrowserActionsContainer::OnBrowserActionExecuted(