Remove Deprecate Code For Desktop Capture Picker Old UI

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm

 // Copyright 2013 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/ui/cocoa/media_picker/desktop_media_picker_cocoa.h"
 
 #include <utility>
 
 #include "base/command_line.h"

[msw, 2016/12/12 20:19:58]

nit: remove

[qiangchen, 2016/12/12 20:41:28]

Done.

-#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
 #include "extensions/common/switches.h"

[msw, 2016/12/12 20:19:59]

nit: remove

[qiangchen, 2016/12/12 20:41:28]

Done.

 
 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
 }
 
 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() {
 }
 
 void DesktopMediaPickerCocoa::Show(
     content::WebContents* web_contents,
     gfx::NativeWindow context,
     gfx::NativeWindow parent,
     const base::string16& app_name,
     const base::string16& target_name,
     std::unique_ptr<DesktopMediaList> screen_list,
     std::unique_ptr<DesktopMediaList> window_list,
     std::unique_ptr<DesktopMediaList> tab_list,
     bool request_audio,
     const DoneCallback& done_callback) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          extensions::switches::kDisableDesktopCapturePickerNewUI)) {
-    controller_deprecated_.reset([[DesktopMediaPickerControllerDeprecated alloc]

[msw, 2016/12/12 20:19:58]

Remove this member from desktop_media_picker_cocoa.h

[qiangchen, 2016/12/12 20:41:28]

Done.

-        initWithScreenList:std::move(screen_list)
-                windowList:std::move(window_list)
-                   tabList:std::move(tab_list)
-                    parent:parent
-                  callback:done_callback
-                   appName:app_name
-                targetName:target_name
-              requestAudio:request_audio]);
-    [controller_deprecated_ showWindow:nil];
-    return;
-  }
-
   controller_.reset([[DesktopMediaPickerController alloc]
       initWithScreenList:std::move(screen_list)
               windowList:std::move(window_list)
                  tabList:std::move(tab_list)
                   parent:parent
                 callback:done_callback
                  appName:app_name
               targetName:target_name
             requestAudio:request_audio]);
   [controller_ showWindow:nil];
 }
 
 // static
 std::unique_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return std::unique_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa());
 }