Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: chrome/browser/extensions/api/tab_capture/tab_capture_api.cc

Issue 11451006: Make TabCapture requests use the target render process and render view id's for UI permissions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years 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
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 26f30d6d72b83b6f3d5fbdf8fe6534ddee7ff759..8c96b1524b84929f8ead7f909d49a32c40803163 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
@@ -117,9 +117,11 @@ bool TabCaptureCaptureFunction::RunImpl() {
extensions::TabCaptureRegistry* registry =
extensions::TabCaptureRegistryFactory::GetForProfile(profile());
- if (!registry->AddRequest(device_id, TabCaptureRegistry::TabCaptureRequest(
- GetExtension()->id(), tab_id,
- tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_NONE))) {
+ if (!registry->AddRequest(
+ std::make_pair(render_process_id, routing_id),
+ TabCaptureRegistry::TabCaptureRequest(
+ GetExtension()->id(), tab_id,
+ tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_NONE))) {
error_ = kCapturingSameTab;
SetResult(base::Value::CreateIntegerValue(0));
return false;

Powered by Google App Engine
This is Rietveld 408576698