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

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

Issue 11827026: Overhaul JSON Schema Compiler to support a number of features required to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
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 1c759836c831c9718d085622dbb4e9faa916d9a9..050638f89726160912167901a59bd8f7d44b290a 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc
@@ -106,9 +106,10 @@ bool TabCaptureCaptureFunction::RunImpl() {
// Append chrome specific tab constraints.
for (std::vector<MediaStreamConstraint*>::iterator it = constraints.begin();
it != constraints.end(); ++it) {
- base::DictionaryValue* constraint = &(*it)->mandatory.additional_properties;
- constraint->SetString(kMediaStreamSource, kMediaStreamSourceTab);
- constraint->SetString(kMediaStreamSourceId, device_id);
+ (*it)->mandatory.additional_properties[kMediaStreamSource] =
+ linked_ptr<base::Value>(new base::StringValue(kMediaStreamSourceTab));
+ (*it)->mandatory.additional_properties[kMediaStreamSourceId] =
+ linked_ptr<base::Value>(new base::StringValue(device_id));
}
extensions::TabCaptureRegistry* registry =
@@ -116,8 +117,9 @@ bool TabCaptureCaptureFunction::RunImpl() {
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))) {
+ GetExtension()->id(),
+ tab_id,
+ tab_capture::TAB_CAPTURE_STATE_NONE))) {
error_ = kCapturingSameTab;
return false;
}

Powered by Google App Engine
This is Rietveld 408576698