Desktop Capture Picker Window New UI For Mac

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

Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm
similarity index 86%
copy from chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
copy to chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm
index 73edf1c474abe7b67a648877b7f260a4e0921975..05cedc8b0f1eeb0fad8322bef773a62639ba168b 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
+#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h"
 
 #include <utility>
 
@@ -11,8 +11,6 @@
 #import "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/media/combined_desktop_media_list.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"
 #include "chrome/common/chrome_switches.h"
@@ -41,7 +39,7 @@ const int kExcessButtonPadding = 6;
 
 }  // namespace
 
-@interface DesktopMediaPickerController (Private)
+@interface DesktopMediaPickerControllerDeprecated (Private)
 
 // Populate the window with controls and views.
 - (void)initializeContentsWithAppName:(const base::string16&)appName;
@@ -64,7 +62,7 @@ const int kExcessButtonPadding = 6;
 
 @end
 
-@implementation DesktopMediaPickerController
+@implementation DesktopMediaPickerControllerDeprecated
 
 - (id)initWithScreenList:(std::unique_ptr<DesktopMediaList>)screen_list
               windowList:(std::unique_ptr<DesktopMediaList>)window_list
@@ -76,11 +74,11 @@ const int kExcessButtonPadding = 6;
             requestAudio:(bool)requestAudio {
   const NSUInteger kStyleMask =
       NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
-  base::scoped_nsobject<NSWindow> window(
-      [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
-                                  styleMask:kStyleMask
-                                    backing:NSBackingStoreBuffered
-                                      defer:NO]);
+  base::scoped_nsobject<NSWindow> window([[NSWindow alloc]
+      initWithContentRect:ui::kWindowSizeDeterminedLater
+                styleMask:kStyleMask
+                  backing:NSBackingStoreBuffered
+                    defer:NO]);
 
   if ((self = [super initWithWindow:window])) {
     [parent addChildWindow:window ordered:NSWindowAbove];
@@ -103,7 +101,7 @@ const int kExcessButtonPadding = 6;
     else
       media_list_ = std::move(media_lists[0]);
     media_list_->SetViewDialogWindowId(content::DesktopMediaID(
-       content::DesktopMediaID::TYPE_WINDOW, [window windowNumber]));
+        content::DesktopMediaID::TYPE_WINDOW, [window windowNumber]));
     doneCallback_ = callback;
     items_.reset([[NSMutableArray alloc] init]);
     bridge_.reset(new DesktopMediaPickerBridge(self));
@@ -138,14 +136,14 @@ const int kExcessButtonPadding = 6;
   // Set the dialog's description.
   NSString* descriptionText;
   if (appName == targetName) {
-    descriptionText = l10n_util::GetNSStringF(
-        IDS_DESKTOP_MEDIA_PICKER_TEXT, appName);
+    descriptionText =
+        l10n_util::GetNSStringF(IDS_DESKTOP_MEDIA_PICKER_TEXT, appName);
   } else {
     descriptionText = l10n_util::GetNSStringF(
         IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED, appName, targetName);
   }
-  NSTextField* description = [self createTextFieldWithText:descriptionText
-                                                frameWidth:kPaddedWidth];
+  NSTextField* description =
+      [self createTextFieldWithText:descriptionText frameWidth:kPaddedWidth];
   [description setFrameOrigin:origin];
   [content addSubview:description];
   origin.y += NSHeight([description frame]) + kControlSpacing;
@@ -160,15 +158,15 @@ const int kExcessButtonPadding = 6;
   [sourceBrowser_ setAllowsMultipleSelection:NO];
 
   // Create a scroll view to host the image browser.
-  NSRect imageBrowserScrollFrame = NSMakeRect(
-      origin.x, origin.y, kPaddedWidth, 350);
+  NSRect imageBrowserScrollFrame =
+      NSMakeRect(origin.x, origin.y, kPaddedWidth, 350);
   base::scoped_nsobject<NSScrollView> imageBrowserScroll(
       [[NSScrollView alloc] initWithFrame:imageBrowserScrollFrame]);
   [imageBrowserScroll setHasVerticalScroller:YES];
   [imageBrowserScroll setDocumentView:sourceBrowser_];
   [imageBrowserScroll setBorderType:NSBezelBorder];
-  [imageBrowserScroll setAutoresizingMask:
-      NSViewWidthSizable | NSViewHeightSizable];
+  [imageBrowserScroll
+      setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   [content addSubview:imageBrowserScroll];
   origin.y += NSHeight(imageBrowserScrollFrame) + kControlSpacing;
 
@@ -192,10 +190,11 @@ const int kExcessButtonPadding = 6;
   }
 
   // Create the share button.
-  shareButton_ = [self createButtonWithTitle:l10n_util::GetNSString(
-      IDS_DESKTOP_MEDIA_PICKER_SHARE)];
+  shareButton_ =
+      [self createButtonWithTitle:l10n_util::GetNSString(
+                                      IDS_DESKTOP_MEDIA_PICKER_SHARE)];
   origin.x = kInitialContentWidth - kFramePadding -
-      (NSWidth([shareButton_ frame]) - kExcessButtonPadding);
+             (NSWidth([shareButton_ frame]) - kExcessButtonPadding);
   [shareButton_ setEnabled:NO];
   [shareButton_ setFrameOrigin:origin];
   [shareButton_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
@@ -208,21 +207,21 @@ const int kExcessButtonPadding = 6;
   cancelButton_ =
       [self createButtonWithTitle:l10n_util::GetNSString(IDS_CANCEL)];
   origin.x -= kControlSpacing +
-      (NSWidth([cancelButton_ frame]) - (kExcessButtonPadding * 2));
+              (NSWidth([cancelButton_ frame]) - (kExcessButtonPadding * 2));
   [cancelButton_ setFrameOrigin:origin];
   [cancelButton_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
   [cancelButton_ setTarget:self];
   [cancelButton_ setKeyEquivalent:kKeyEquivalentEscape];
   [cancelButton_ setAction:@selector(cancelPressed:)];
   [content addSubview:cancelButton_];
-  origin.y += kFramePadding +
-      (NSHeight([cancelButton_ frame]) - kExcessButtonPadding);
+  origin.y +=
+      kFramePadding + (NSHeight([cancelButton_ frame]) - kExcessButtonPadding);
 
   // Resize window to fit.
   [[[self window] contentView] setAutoresizesSubviews:NO];
   [[self window] setContentSize:NSMakeSize(kInitialContentWidth, origin.y)];
-  [[self window] setContentMinSize:
-      NSMakeSize(kMinimumContentWidth, kMinimumContentHeight)];
+  [[self window] setContentMinSize:NSMakeSize(kMinimumContentWidth,
+                                              kMinimumContentHeight)];
   [[[self window] contentView] setAutoresizesSubviews:YES];
 
   // Make sourceBrowser_ get keyboard focus.
@@ -247,34 +246,27 @@ const int kExcessButtonPadding = 6;
   sourceID.audio_share = [audioShareCheckbox_ isEnabled] &&
                          [audioShareCheckbox_ state] == NSOnState;
 
+  // If the media source is an tab, activate it.
   if (sourceID.type == content::DesktopMediaID::TYPE_WEB_CONTENTS) {
-    // Activate the selected tab and bring the browser window for the selected
-    // tab to the front.
     content::WebContents* tab = content::WebContents::FromRenderFrameHost(
         content::RenderFrameHost::FromID(
             sourceID.web_contents_id.render_process_id,
             sourceID.web_contents_id.main_render_frame_id));
-    if (tab) {
+    if (tab)
       tab->GetDelegate()->ActivateContents(tab);
-      Browser* browser = chrome::FindBrowserWithWebContents(tab);
-      if (browser && browser->window())
-        browser->window()->Activate();
-    }
   }
 
   // Notify the |callback_| asynchronously because it may release the
   // controller.
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI, FROM_HERE,
-      base::Bind(doneCallback_, sourceID));
+  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+                                   base::Bind(doneCallback_, sourceID));
   doneCallback_.Reset();
 }
 
 - (void)sharePressed:(id)sender {
   NSIndexSet* indexes = [sourceBrowser_ selectionIndexes];
   NSUInteger selectedIndex = [indexes firstIndex];
-  DesktopMediaPickerItem* item =
-      [items_ objectAtIndex:selectedIndex];
+  DesktopMediaPickerItem* item = [items_ objectAtIndex:selectedIndex];
   [self reportResult:[item sourceID]];
   [self close];
 }
@@ -328,15 +320,14 @@ const int kExcessButtonPadding = 6;
   return [items_ count];
 }
 
-- (id)imageBrowser:(IKImageBrowserView *)browser
-       itemAtIndex:(NSUInteger)index {
+- (id)imageBrowser:(IKImageBrowserView*)browser itemAtIndex:(NSUInteger)index {
   return [items_ objectAtIndex:index];
 }
 
 #pragma mark IKImageBrowserDelegate
 
-- (void)imageBrowser:(IKImageBrowserView *)browser
-      cellWasDoubleClickedAtIndex:(NSUInteger)index {
+- (void)imageBrowser:(IKImageBrowserView*)browser
+    cellWasDoubleClickedAtIndex:(NSUInteger)index {
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
   [self reportResult:[item sourceID]];
   [self close];
@@ -392,7 +383,7 @@ const int kExcessButtonPadding = 6;
 
 #pragma mark DesktopMediaPickerObserver
 
-- (void)sourceAddedAtIndex:(int)index {
+- (void)sourceAddedForList:(DesktopMediaList*)list atIndex:(int)index {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   NSString* imageTitle = base::SysUTF16ToNSString(source.name);
   base::scoped_nsobject<DesktopMediaPickerItem> item(
@@ -412,17 +403,19 @@ const int kExcessButtonPadding = 6;
   }
 }
 
-- (void)sourceRemovedAtIndex:(int)index {
+- (void)sourceRemovedForList:(DesktopMediaList*)list atIndex:(int)index {
   if ([[sourceBrowser_ selectionIndexes] containsIndex:index]) {
     // Selected item was removed. Clear selection.
     [sourceBrowser_ setSelectionIndexes:[NSIndexSet indexSet]
-                      byExtendingSelection:FALSE];
+                   byExtendingSelection:FALSE];
   }
   [items_ removeObjectAtIndex:index];
   [sourceBrowser_ reloadData];
 }
 
-- (void)sourceMovedFrom:(int)oldIndex to:(int)newIndex {
+- (void)sourceMovedForList:(DesktopMediaList*)list
+                      from:(int)oldIndex
+                        to:(int)newIndex {
   base::scoped_nsobject<DesktopMediaPickerItem> item(
       [[items_ objectAtIndex:oldIndex] retain]);
   [items_ removeObjectAtIndex:oldIndex];
@@ -430,14 +423,15 @@ const int kExcessButtonPadding = 6;
   [sourceBrowser_ reloadData];
 }
 
-- (void)sourceNameChangedAtIndex:(int)index {
+- (void)sourceNameChangedForList:(DesktopMediaList*)list atIndex:(int)index {
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   [item setImageTitle:base::SysUTF16ToNSString(source.name)];
   [sourceBrowser_ reloadData];
 }
 
-- (void)sourceThumbnailChangedAtIndex:(int)index {
+- (void)sourceThumbnailChangedForList:(DesktopMediaList*)list
+                              atIndex:(int)index {
   const DesktopMediaList::Source& source = media_list_->GetSource(index);
   NSImage* image = gfx::NSImageFromImageSkia(source.thumbnail);