Show error message for desktop capture related APIs on Aura Android

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
@@ skipping 110 matching lines @@
           show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
       scoped_ptr<webrtc::WindowCapturer> window_capturer(
           show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
 
       media_list.reset(new NativeDesktopMediaList(
           screen_capturer.Pass(), window_capturer.Pass()));
     }
 
     // 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.";
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults,
       this);
 
@@ skipping 90 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions