| 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 a15e8fb5d339a0db3b65c6deedb610313b3e0fa9..74e1b575c9c5072d7ec5aecd48abd619315f0e9d 100644
|
| --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
|
| @@ -130,12 +130,7 @@
|
|
|
| // DesktopMediaPicker is implemented only for Windows, OSX and
|
| // Aura Linux builds.
|
| - // TODO(bshe): Use ANDROID_JAVA_UI flag here after it landed.
|
| -#if (defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)) || defined(OS_MACOSX)
|
| - // TODO(bshe): This is called if chrome.desktopCapture.chooseDesktopMedia
|
| - // or chrome.webrtcDesktopCapturePrivate.chooseDesktopMedia are called by
|
| - // extensions. Simply return error message on Android platform for now.
|
| - // Revisit this when necessary. See crbug.com/557424.
|
| +#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
|
| picker_ = DesktopMediaPicker::Create();
|
| #else
|
| error_ = "Desktop Capture API is not yet implemented for this platform.";
|
|
|