Show error message for desktop capture related APIs on Aura Android

chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

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 22302a1434cfca5002a992174da5175257cf79e0..bc2601e1e4c16864774d5161c54c7658c17f8f4c 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -128,7 +128,11 @@ bool DesktopCaptureChooseDesktopMediaFunctionBase::Execute(
 
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID) || defined(OS_MACOSX)

[mfomitchev, 2015/11/19 15:56:55]

Note that Dan is adding a new ANDROID_JAVA_UI define - see
https://codereview.chromium.org/1459793002/. It's meant to be used in chrome/
(it really means "browser UI done in native Android Java"). Once this lands, we
should switch USE_AURA && ANDROID in chrome/ to ANDROID_JAVA_UI

[mfomitchev, 2015/11/19 15:56:55]

Can you please add braces here so that it is more explicit/easier to read?

[bshe, 2015/11/19 20:14:38]

Done.

[bshe, 2015/11/19 20:14:38]

Added a TODO.

+    // 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.
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";