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

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

Issue 2961193002: Use same DesktopCaptureOptions in DesktopCaptureBase and DesktopCaptureDevice (Closed)
Patch Set: Sync latest changes Created 3 years, 5 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 | « no previous file | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 05ca164a550c0f16d4e3ea44a94c6e6a1acd4ce1..93df4fd4de56c5745c617de1a3fe1063e20db32c 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/grit/chromium_strings.h"
+#include "content/public/browser/desktop_capture.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
@@ -119,12 +120,10 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
screen_list = base::MakeUnique<DesktopMediaListAsh>(
DesktopMediaID::TYPE_SCREEN);
#else // !defined(USE_ASH)
- webrtc::DesktopCaptureOptions capture_options =
- webrtc::DesktopCaptureOptions::CreateDefault();
- capture_options.set_disable_effects(false);
screen_list = base::MakeUnique<NativeDesktopMediaList>(
- DesktopMediaID::TYPE_SCREEN,
- webrtc::DesktopCapturer::CreateScreenCapturer(capture_options));
+ content::DesktopMediaID::TYPE_SCREEN,
+ webrtc::DesktopCapturer::CreateScreenCapturer(
+ content::CreateDesktopCaptureOptions()));
#endif // !defined(USE_ASH)
}
have_screen_list = true;
@@ -149,12 +148,10 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
// windows) created here cannot share the same DesktopCaptureOptions
// instance. DesktopCaptureOptions owns X connection, which cannot be
// used on multiple threads concurrently.
- webrtc::DesktopCaptureOptions capture_options =
- webrtc::DesktopCaptureOptions::CreateDefault();
- capture_options.set_disable_effects(false);
window_list = base::MakeUnique<NativeDesktopMediaList>(
- DesktopMediaID::TYPE_WINDOW,
- webrtc::DesktopCapturer::CreateWindowCapturer(capture_options));
+ content::DesktopMediaID::TYPE_WINDOW,
+ webrtc::DesktopCapturer::CreateWindowCapturer(
+ content::CreateDesktopCaptureOptions()));
#endif // !defined(USE_ASH)
}
have_window_list = true;
« no previous file with comments | « no previous file | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698