chrome/browser/extensions/api/tab_capture/tab_capture_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/tab_capture/tab_capture_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/extension_action/browser_action_interactive_test.cc ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tab_capture/tab_capture_api.cc

diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc

index 4bd54f8c5c1a286e8e62b154ddf3fe2391b5b320..52e95b6ae5819adcb156bf535b502b56eec7b87e 100644

--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc

+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc

@@ -16,7 +16,7 @@

#include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"

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

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

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

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

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

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

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

@@ -87,7 +87,7 @@ bool TabCaptureCaptureFunction::RunSync() {

// Make sure either we have been granted permission to capture through an

// extension icon click or our extension is whitelisted.

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

- SessionID::IdForTab(target_contents),

+ SessionTabHelper::IdForTab(target_contents),

APIPermission::kTabCaptureForTab) &&

CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

switches::kWhitelistedExtensionID) != extension_id &&