chrome/browser/extensions/api/tabs/tabs_api.cc - Issue 480883002: Move session_id.{cc,h} from chrome/browser/sessions to components/sessions

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/api/tabs/tabs_api.cc

Issue 480883002: Move session_id.{cc,h} from chrome/browser/sessions to components/sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/extensions/browser_extension_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tabs/tabs_api.cc

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc

index 40e84dd0a11043f9f3731c86dc8f5113445ee823..f379b70d830d9b7581007013c03af8ec1e1dedc3 100644

--- a/chrome/browser/extensions/api/tabs/tabs_api.cc

+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

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

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

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

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

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

#include "chrome/browser/translate/chrome_translate_client.h"

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

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

@@ -1087,7 +1088,7 @@ bool TabsUpdateFunction::RunAsync() {

error_ = keys::kNoSelectedTabError;

return false;

}

- tab_id = SessionID::IdForTab(contents);

+ tab_id = SessionTabHelper::IdForTab(contents);

} else {

tab_id = *params->tab_id;

}

@@ -1517,7 +1518,7 @@ WebContents* TabsCaptureVisibleTabFunction::GetWebContentsForID(int window_id) {

}

if (!extension()->permissions_data()->CanCaptureVisiblePage(

- SessionID::IdForTab(contents), &error_)) {

+ SessionTabHelper::IdForTab(contents), &error_)) {

return NULL;

}

return contents;