| 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();
|
|
|