Make Desktop Capture New Feature 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"
 #include "base/memory/ptr_util.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/media/tab_desktop_media_list.h"
 #include "chrome/common/channel_info.h"

[msw, 2016/07/07 18:34:16]

nit: remove

[qiangchen, 2016/07/08 17:13:22]

Done.

 #include "components/version_info/version_info.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 {
@@ skipping 60 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;
-        } else if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            extensions::switches::kDisableTabForDesktopShare)) {
-          show_tabs = false;
-        } else {
-          const version_info::Channel channel = chrome::GetChannel();
-          if ((channel == version_info::Channel::STABLE) ||
-              (channel == version_info::Channel::BETA)) {
-            show_tabs = false;
-          } else {
-            show_tabs = true;
-          }
         }
         break;
 
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_AUDIO:
         bool has_flag = base::CommandLine::ForCurrentProcess()->HasSwitch(
             extensions::switches::kDisableDesktopCaptureAudio);
         request_audio = !has_flag;
         break;
     }
   }
@@ skipping 159 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