Bring Audio Share and Tab Share Default On

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"
@@ skipping 79 matching lines @@
 
       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:
-        if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-                extensions::switches::kEnableTabForDesktopShare)) {
+        if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+                extensions::switches::kDisableTabForDesktopShare)) {
           show_tabs = true;
         }
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_AUDIO:
         bool has_flag = base::CommandLine::ForCurrentProcess()->HasSwitch(
-            extensions::switches::kEnableDesktopCaptureAudio);
-        request_audio = has_flag;
+            extensions::switches::kDisableDesktopCaptureAudio);
+        request_audio = !has_flag;

[Sergey Ulanov, 2016/03/29 18:48:19]

What if the application doesn't care about audio? Is there a way for it to hide
the check box in that case?

[qiangchen, 2016/03/29 20:10:44]

Yes. When here we detect a request with type
"DESKTOP_CAPTURE_SOURCE_TYPE_AUDIO", it means the javascript chooseDesktopMedia
include "audio" as source, thus it means the application is interested in audio
capture.

If the application is not interested in audio capture, it should not include
"audio" in the source types, and then request_audio will be false here.

[Sergey Ulanov, 2016/03/30 19:34:22]

I see. To be honest this doesn't look like a good API design. Did this API
change go through extension API review? The sources parameter is for list of
sources that the user can choose from. Audio support orthogonal, e.g. it's not
possible to choose audio without video. IMO it would be better to add a separate
optional parameter to that call. If you decide to stick with this API then you
should update the description for the sources parameter in
chrome/common/extensions/api/desktop_capture.json . Otherwise it's not clear
that the 'audio' has special meaning. Obviously this shouldn't be part of this
CL.

         break;
     }
   }
 
   if (!show_screens && !show_windows && !show_tabs) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
   const gfx::NativeWindow parent_window =
@@ skipping 139 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