chrome/browser/extensions/extension_tab_id_map.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/extensions/extension_tab_id_map.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/printing/background_printing_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_tab_id_map.cc

diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc

index 9f590dcf1fa4e046eb11c1560394bf9fc860bd8f..43170aca224ca7a815b9ca0f412ef0d843056172 100644

--- a/chrome/browser/extensions/extension_tab_id_map.cc

+++ b/chrome/browser/extensions/extension_tab_id_map.cc

@@ -6,7 +6,7 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

@@ -80,8 +80,8 @@ void ExtensionTabIdMap::TabObserver::Observe(

&ExtensionTabIdMap::SetTabAndWindowId,

base::Unretained(ExtensionTabIdMap::GetInstance()),

host->GetProcess()->GetID(), host->GetRoutingID(),

- tab->restore_tab_helper()->session_id().id(),

- tab->restore_tab_helper()->window_id().id()));

+ tab->session_tab_helper()->session_id().id(),

+ tab->session_tab_helper()->window_id().id()));

break;

}

case chrome::NOTIFICATION_TAB_PARENTED: {

@@ -94,8 +94,8 @@ void ExtensionTabIdMap::TabObserver::Observe(

&ExtensionTabIdMap::SetTabAndWindowId,

base::Unretained(ExtensionTabIdMap::GetInstance()),

host->GetProcess()->GetID(), host->GetRoutingID(),

- tab->restore_tab_helper()->session_id().id(),

- tab->restore_tab_helper()->window_id().id()));

+ tab->session_tab_helper()->session_id().id(),

+ tab->session_tab_helper()->window_id().id()));

break;

}

case chrome::NOTIFICATION_RETARGETING: {

@@ -112,8 +112,8 @@ void ExtensionTabIdMap::TabObserver::Observe(

&ExtensionTabIdMap::SetTabAndWindowId,

base::Unretained(ExtensionTabIdMap::GetInstance()),

host->GetProcess()->GetID(), host->GetRoutingID(),

- tab->restore_tab_helper()->session_id().id(),

- tab->restore_tab_helper()->window_id().id()));

+ tab->session_tab_helper()->session_id().id(),

+ tab->session_tab_helper()->window_id().id()));

break;

}

case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {