Desktop Capture Picker Window New UI For Mac

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #import <Quartz/Quartz.h>
 
 #include <memory>
 
 #include "base/callback.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_picker.h"
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h"
 
 // A controller for the Desktop Media Picker. Presents the user with a list of
 // media sources for screen-capturing, and reports the result.
 @interface DesktopMediaPickerController
-    : NSWindowController<NSWindowDelegate, DesktopMediaPickerObserver> {
+    : NSWindowController<NSWindowDelegate,
+                         DesktopMediaPickerObserver,
+                         NSTableViewDataSource,
+                         NSTableViewDelegate> {
  @private
-  // The image browser view to present sources to the user (thumbnails and
-  // names).
-  base::scoped_nsobject<IKImageBrowserView> sourceBrowser_;
+  // The image browser view or table view to present sources to the user
+  // (thumbnails and names).
+  base::scoped_nsobject<IKImageBrowserView> screenBrowser_;
+  base::scoped_nsobject<IKImageBrowserView> windowBrowser_;
+  base::scoped_nsobject<NSTableView> tabBrowser_;
+
+  base::scoped_nsobject<NSScrollView> imageBrowserScroll_;
+
+  base::scoped_nsobject<NSSegmentedControl> sourceTypeControl_;
 
   // The button used to confirm the selection.
   NSButton* shareButton_;  // weak; owned by contentView
 
   // The button used to cancel and close the dialog.
   NSButton* cancelButton_;  // weak; owned by contentView
 
   // The checkbox for audio share.
   // |audioShareState_| records the state when check box is disabled.
   base::scoped_nsobject<NSButton> audioShareCheckbox_;
   NSCellStateValue audioShareState_;
 
-  // Provides source information (including thumbnails) to fill up |items_| and
-  // to render in |sourceBrowser_|.
-  std::unique_ptr<DesktopMediaList> media_list_;
+  // Provides source information (including thumbnails) to fill up the array of
+  // |screen_items_|, |window_items_| and |tab_items_|, and to render in
+  // |screenBrowser_|, |windowBrowser_| and |tabBrowser_|.
+  std::unique_ptr<DesktopMediaList> screen_list_;

[tapted, 2016/06/20 12:18:34]

These need to be screenList_ naming style. Same with the rest

[qiangchen, 2016/06/21 23:31:26]

Done.

+  std::unique_ptr<DesktopMediaList> window_list_;
+  std::unique_ptr<DesktopMediaList> tab_list_;
 
   // To be called with the user selection.
   DesktopMediaPicker::DoneCallback doneCallback_;
 
-  // Array of |DesktopMediaPickerItem| used as data for |sourceBrowser_|.
-  base::scoped_nsobject<NSMutableArray> items_;
+  // Arrays of |DesktopMediaPickerItem| used as data for |screenBrowser|,
+  // |windowBrowser_| and |tabBrowser|.
+  base::scoped_nsobject<NSMutableArray> screen_items_;
+  base::scoped_nsobject<NSMutableArray> window_items_;
+  base::scoped_nsobject<NSMutableArray> tab_items_;
 
-  // C++ bridge to use as an observer to |media_list_|, that forwards obj-c
-  // notifications to this object.
+  // C++ bridge to use as an observer to |screen_list_|, |window_list_| and
+  // |tab_list_|, that forwards obj-c notifications to this object.
   std::unique_ptr<DesktopMediaPickerBridge> bridge_;
 
   // Used to create |DesktopMediaPickerItem|s with unique IDs.
   int lastImageUID_;
 }
 
 // Designated initializer.
 // To show the dialog, use |NSWindowController|'s |showWindow:|.
 // |callback| will be called to report the user's selection.
 // |appName| will be used to format the dialog's title and the label, where it
 // appears as the initiator of the request.
 // |targetName| will be used to format the dialog's label and appear as the
 // consumer of the requested stream.
 - (id)initWithScreenList:(std::unique_ptr<DesktopMediaList>)screen_list

[tapted, 2016/06/20 12:18:34]

arguments should be screenList style too

[qiangchen, 2016/06/21 23:31:26]

Done.

               windowList:(std::unique_ptr<DesktopMediaList>)window_list
                  tabList:(std::unique_ptr<DesktopMediaList>)tab_list
                   parent:(NSWindow*)parent
                 callback:(const DesktopMediaPicker::DoneCallback&)callback
                  appName:(const base::string16&)appName
               targetName:(const base::string16&)targetName
             requestAudio:(bool)requestAudio;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_H_