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

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

Issue 23493028: Revert 221874 "Implement Desktop Media Picker (Mac version) for ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | trunk/src/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: trunk/src/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc (revision 221900)
+++ trunk/src/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc (working copy)
@@ -4,7 +4,6 @@
#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"
@@ -88,8 +87,9 @@
screen_capturer.Pass(), window_capturer.Pass());
picker_ = g_picker_factory->CreatePicker();
} else {
- // DesktopMediaPicker is not implented for all platforms yet.
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
+ // Currently DesktopMediaPicker is implemented only for platforms that
+ // use Views.
+#if defined(TOOLKIT_VIEWS)
model.reset(new DesktopMediaPickerModelImpl(
screen_capturer.Pass(), window_capturer.Pass()));
picker_ = DesktopMediaPicker::Create();
« no previous file with comments | « no previous file | trunk/src/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