Desktop Share Audio User Permission

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 <tuple>
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.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"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/common/switches.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace extensions {
 
 namespace {
 
 const char kInvalidSourceNameError[] = "Invalid source type specified.";
 const char kEmptySourcesListError[] =
@@ skipping 39 matching lines @@
     const std::vector<api::desktop_capture::DesktopCaptureSourceType>& sources,
     content::WebContents* web_contents,
     const GURL& origin,
     const base::string16 target_name) {
   // Register to be notified when the tab is closed.
   Observe(web_contents);
 
   bool show_screens = false;
   bool show_windows = false;
 
+  bool request_audio = false;
+
   for (auto source_type : sources) {
     switch (source_type) {
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_NONE:
         error_ = kInvalidSourceNameError;
         return false;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_SCREEN:
         show_screens = true;
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_WINDOW:
         show_windows = true;
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_TAB:
         error_ = kTabCaptureNotSupportedError;
         return false;
+
+      case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_AUDIO:
+        bool has_flag = base::CommandLine::ForCurrentProcess()->HasSwitch(

[Ken Rockot(use gerrit already), 2016/02/03 14:22:25]

nit: i don't think there's a need to introduce has_flag here, can you just
assign directly to request_audio?

[qiangchen, 2016/02/03 17:41:41]

I think it is better to put it behind the flag, until we complete everything.
Otherwise, theoretically there is a chance web developer could plug in "audio"
in the sources parameter when calling chooseDesktopMedia, and discover a funny
thing that it could make a checkbox visible, but unusable.

+            extensions::switches::kEnableDesktopCaptureAudio);
+        request_audio = has_flag;
+        break;
     }
   }
 
   if (!show_screens && !show_windows) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
   const gfx::NativeWindow parent_window =
       web_contents->GetTopLevelNativeWindow();
@@ skipping 31 matching lines @@
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults,
       this);
 
   picker_->Show(web_contents, parent_window, parent_window,
                 base::UTF8ToUTF16(extension()->name()), target_name,
-                std::move(media_list), callback);
+                std::move(media_list), request_audio, callback);
   origin_ = origin;
   return true;
 }
 
 void DesktopCaptureChooseDesktopMediaFunctionBase::WebContentsDestroyed() {
   Cancel();
 }
 
 void DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults(
     content::DesktopMediaID source) {
@@ skipping 70 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