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

Unified Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

Issue 1503563004: Desktop chrome tab capture-chooseDesktopMedia() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/desktop_capture/desktop_capture_base.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
index 04c3685110401a8a43a598b0e45f69ea92f522df..6395822c2839b3f505fb6c53b3876a6e6db1ef0a 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -76,6 +76,7 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
bool show_screens = false;
bool show_windows = false;
+ bool show_tabs = false;
Sergey Ulanov 2016/01/13 22:53:16 remove this. You don't need any changes in this fi
GeorgeZ 2016/01/13 23:15:53 Done.
for (auto source_type : sources) {
switch (source_type) {
@@ -94,10 +95,11 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB:
error_ = kTabCaptureNotSupportedError;
return false;
+ break;
}
}
- if (!show_screens && !show_windows) {
+ if (!show_screens && !show_windows && !show_tabs) {
error_ = kEmptySourcesListError;
return false;
}
@@ -125,7 +127,6 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
scoped_ptr<webrtc::WindowCapturer> window_capturer(
show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
-
media_list.reset(new NativeDesktopMediaList(std::move(screen_capturer),
std::move(window_capturer)));
}

Powered by Google App Engine
This is Rietveld 408576698