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

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

Issue 23944003: Implement Desktop Media Picker (Mac version) for Desktop Capture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clearing delegate/dataSource on dealloc. Fixes 10.6 tests. Created 7 years, 3 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 | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h » ('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_api.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index 066bc0540925a68a9bff52766889b898f3ac1e7d..8f2877cadc34a2e62309346d01791cded428f20c 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h"
+#include "base/compiler_specific.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/media/desktop_streams_registry.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -87,9 +88,8 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
screen_capturer.Pass(), window_capturer.Pass());
picker_ = g_picker_factory->CreatePicker();
} else {
- // Currently DesktopMediaPicker is implemented only for platforms that
- // use Views.
-#if defined(TOOLKIT_VIEWS)
+ // DesktopMediaPicker is not implented for all platforms yet.
+#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
model.reset(new DesktopMediaPickerModelImpl(
screen_capturer.Pass(), window_capturer.Pass()));
picker_ = DesktopMediaPicker::Create();
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698