Desktop Capture Picker Window New UI For Mac

chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.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.
 
-#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>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #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"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "grit/components_strings.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/flipped_view.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
 const int kInitialContentWidth = 620;
 const int kMinimumContentWidth = 500;
 const int kMinimumContentHeight = 390;
 const int kThumbnailWidth = 150;
 const int kThumbnailHeight = 150;
 const int kFramePadding = 20;
 const int kControlSpacing = 10;
 const int kExcessButtonPadding = 6;
 
 }  // namespace
 
-@interface DesktopMediaPickerController (Private)
+@interface DesktopMediaPickerControllerDeprecated (Private)
 
 // Populate the window with controls and views.
 - (void)initializeContentsWithAppName:(const base::string16&)appName;
 
 // Create a |NSTextField| with label traits given |width|. Frame height is
 // automatically adjusted to fit.
 - (NSTextField*)createTextFieldWithText:(NSString*)text
                              frameWidth:(CGFloat)width;
 
 // Create a button with |title|, with size adjusted to fit.
 - (NSButton*)createButtonWithTitle:(NSString*)title;
 
 // Report result by invoking |doneCallback_|. The callback is invoked only on
 // the first call to |reportResult:|. Subsequent calls will be no-ops.
 - (void)reportResult:(content::DesktopMediaID)sourceID;
 
 // Action handlers.
 - (void)sharePressed:(id)sender;
 - (void)cancelPressed:(id)sender;
 
 @end
 
-@implementation DesktopMediaPickerController
+@implementation DesktopMediaPickerControllerDeprecated
 
 - (id)initWithScreenList:(std::unique_ptr<DesktopMediaList>)screen_list
               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 {
   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];
     [window setDelegate:self];
     [self initializeContentsWithAppName:appName
                              targetName:targetName
                            requestAudio:requestAudio];
     std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
     if (screen_list)
       media_lists.push_back(std::move(screen_list));
 
     if (window_list)
       media_lists.push_back(std::move(window_list));
 
     if (tab_list)
       media_lists.push_back(std::move(tab_list));
 
     if (media_lists.size() > 1)
       media_list_.reset(new CombinedDesktopMediaList(media_lists));
     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));
   }
   return self;
 }
 
 - (void)dealloc {
   [shareButton_ setTarget:nil];
   [cancelButton_ setTarget:nil];
@@ skipping 14 matching lines @@
   NSPoint origin = NSMakePoint(kFramePadding, kFramePadding);
 
   // Set the dialog's title.
   NSString* titleText = l10n_util::GetNSStringF(
       IDS_DESKTOP_MEDIA_PICKER_TITLE_DEPRECATED, appName);
   [[self window] setTitle:titleText];
 
   // 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;
 
   // Create the image browser.
   sourceBrowser_.reset([[IKImageBrowserView alloc] initWithFrame:NSZeroRect]);
   NSUInteger cellStyle = IKCellsStyleShadowed | IKCellsStyleTitled;
   [sourceBrowser_ setDelegate:self];
   [sourceBrowser_ setDataSource:self];
   [sourceBrowser_ setCellsStyleMask:cellStyle];
   [sourceBrowser_ setCellSize:NSMakeSize(kThumbnailWidth, kThumbnailHeight)];
   [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;
 
   // Create a checkbox for audio sharing.
   if (requestAudio) {
     audioShareCheckbox_.reset([[NSButton alloc] initWithFrame:NSZeroRect]);
     [audioShareCheckbox_ setFrameOrigin:origin];
     [audioShareCheckbox_
         setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
     [audioShareCheckbox_ setButtonType:NSSwitchButton];
     audioShareState_ = NSOnState;
     [audioShareCheckbox_
         setTitle:l10n_util::GetNSString(IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE)];
     [audioShareCheckbox_ sizeToFit];
     [audioShareCheckbox_ setEnabled:NO];
     [audioShareCheckbox_
         setToolTip:l10n_util::GetNSString(
                        IDS_DESKTOP_MEDIA_PICKER_AUDIO_SHARE_TOOLTIP_MAC)];
     [content addSubview:audioShareCheckbox_];
     origin.y += NSHeight([audioShareCheckbox_ frame]) + kControlSpacing;
   }
 
   // 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];
   [shareButton_ setTarget:self];
   [shareButton_ setKeyEquivalent:kKeyEquivalentReturn];
   [shareButton_ setAction:@selector(sharePressed:)];
   [content addSubview:shareButton_];
 
   // Create the cancel button.
   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.
   [[self window] makeFirstResponder:sourceBrowser_];
 }
 
 - (void)showWindow:(id)sender {
   // Signal the media_list to start sending thumbnails. |bridge_| is used as the
   // observer, and will forward notifications to this object.
   media_list_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight));
   media_list_->StartUpdating(bridge_.get());
 
   [self.window center];
   [super showWindow:sender];
 }
 
 - (void)reportResult:(content::DesktopMediaID)sourceID {
   if (doneCallback_.is_null()) {
     return;
   }
 
   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];
 }
 
 - (void)cancelPressed:(id)sender {
   [self reportResult:content::DesktopMediaID()];
   [self close];
 }
 
 - (NSTextField*)createTextFieldWithText:(NSString*)text
@@ skipping 33 matching lines @@
   NSWindow* window = [self window];
   [[window parentWindow] removeChildWindow:window];
 }
 
 #pragma mark IKImageBrowserDataSource
 
 - (NSUInteger)numberOfItemsInImageBrowser:(IKImageBrowserView*)browser {
   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];
 }
 
 - (void)imageBrowserSelectionDidChange:(IKImageBrowserView*)browser {
   NSIndexSet* indexes = [sourceBrowser_ selectionIndexes];
 
   // Enable or disable the OK button based on whether we have a selection.
   [shareButton_ setEnabled:([indexes count] > 0)];
@@ skipping 35 matching lines @@
       }
       [audioShareCheckbox_ setToolTip:@""];
       break;
     case content::DesktopMediaID::TYPE_NONE:
       NOTREACHED();
   }
 }
 
 #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(
       [[DesktopMediaPickerItem alloc] initWithSourceId:source.id
                                               imageUID:++lastImageUID_
                                             imageTitle:imageTitle]);
   [items_ insertObject:item atIndex:index];
   [sourceBrowser_ reloadData];
 
   NSString* autoselectSource = base::SysUTF8ToNSString(
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kAutoSelectDesktopCaptureSource));
 
   if ([autoselectSource isEqualToString:imageTitle]) {
     [self reportResult:[item sourceID]];
     [self close];
   }
 }
 
-- (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];
   [items_ insertObject:item atIndex:newIndex];
   [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);
 
   DesktopMediaPickerItem* item = [items_ objectAtIndex:index];
   [item setImageRepresentation:image];
   [sourceBrowser_ reloadData];
 }
 
 @end  // @interface DesktopMediaPickerController