Change the Bluetooth chooser buttons order to be Cancel/Pair on MacOS

chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm

 // Copyright 2016 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/device_chooser_content_view_cocoa.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/macros.h"
@@ skipping 384 matching lines @@
   // ------------------------------------
   // | Chooser title                    |
   // | -------------------------------- |
   // | | option 0                     | |
   // | | option 1                     | |
   // | | option 2                     | |
   // | |                              | |
   // | |                              | |
   // | |                              | |
   // | -------------------------------- |
-  // |           [ Connect ] [ Cancel ] |
+  // |           [ Cancel ] [ Connect ] |
   // |----------------------------------|
   // | Get help                         |
   // ------------------------------------
 
   // Determine the dimensions of the chooser.
   // Once the height and width are set, the buttons and permission menus can
   // be laid out correctly.
   NSRect chooserFrame = NSMakeRect(0, 0, kChooserWidth, kChooserHeight);
 
   if ((self = [super initWithFrame:chooserFrame])) {
@@ skipping 11 matching lines @@
                 IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT)];
     CGFloat adapterOffHelpButtonWidth = NSWidth([adapterOffHelpButton_ frame]);
     CGFloat adapterOffHelpButtonHeight =
         NSHeight([adapterOffHelpButton_ frame]);
 
     // Adapter turned off message.
     adapterOffMessage_ = CreateLabel(l10n_util::GetNSStringF(
         IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, base::string16()));
     CGFloat adapterOffMessageWidth = NSWidth([adapterOffMessage_ frame]);
 
+    // Cancel button.
+    cancelButton_ = [self createCancelButton];
+    CGFloat cancelButtonWidth = NSWidth([cancelButton_ frame]);
+    CGFloat cancelButtonHeight = NSHeight([cancelButton_ frame]);
+
     // Connect button.
     connectButton_ = [self createConnectButton];
     CGFloat connectButtonWidth = NSWidth([connectButton_ frame]);
-    CGFloat connectButtonHeight = NSHeight([connectButton_ frame]);
-
-    // Cancel button.
-    cancelButton_ = [self createCancelButton];
-    CGFloat cancelButtonWidth = NSWidth([cancelButton_ frame]);
 
     // Separator.
     separator_ = [self createSeparator];
 
     // Help button.
     CGFloat helpButtonWidth = 0.0f;
     CGFloat helpButtonHeight = 0.0f;
     if (chooserController_->ShouldShowFootnoteView()) {
       helpButton_ =
           [self createHyperlinkButtonWithText:
@@ skipping 18 matching lines @@
     rescanButton_ =
         [self createHyperlinkButtonWithText:
                   l10n_util::GetNSString(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN)];
 
     // ScollView embedding with TableView.
     CGFloat scrollViewWidth = kChooserWidth - 2 * kMarginX;
     CGFloat scrollViewHeight =
         kChooserHeight - 2 * kMarginY -
         (chooserController_->ShouldShowFootnoteView() ? 4 * kVerticalPadding
                                                       : 2 * kVerticalPadding) -
-        titleHeight - connectButtonHeight - helpButtonHeight;
+        titleHeight - cancelButtonHeight - helpButtonHeight;
     CGFloat scrollViewOriginX = kMarginX;
     CGFloat scrollViewOriginY =
         kMarginY + helpButtonHeight +
         (chooserController_->ShouldShowFootnoteView() ? 3 * kVerticalPadding
                                                       : kVerticalPadding) +
-        connectButtonHeight;
+        cancelButtonHeight;
     NSRect scrollFrame = NSMakeRect(scrollViewOriginX, scrollViewOriginY,
                                     scrollViewWidth, scrollViewHeight);
     scrollView_.reset([[NSScrollView alloc] initWithFrame:scrollFrame]);
     [scrollView_ setBorderType:NSBezelBorder];
     [scrollView_ setHasVerticalScroller:YES];
     [scrollView_ setHasHorizontalScroller:YES];
     [scrollView_ setAutohidesScrollers:YES];
     [scrollView_ setDrawsBackground:NO];
 
     // TableView.
@@ skipping 51 matching lines @@
                                                    adapterOffMessageOriginY)];
     [adapterOffMessage_ setHidden:YES];
     [self addSubview:adapterOffMessage_];
 
     // ScollView and Spinner. Only one of them is shown.
     [scrollView_ setDocumentView:tableView_];
     [self addSubview:scrollView_];
     [spinner_ setHidden:YES];
     [self addSubview:spinner_];
 
-    // Connect button.
-    CGFloat connectButtonOriginX = kChooserWidth - kMarginX -
-                                   kHorizontalPadding - connectButtonWidth -
-                                   cancelButtonWidth;
-    CGFloat connectButtonOriginY =
+    // Cancel button.
+    CGFloat cancelButtonOriginX = kChooserWidth - kMarginX -
+                                  kHorizontalPadding - cancelButtonWidth -
+                                  connectButtonWidth;
+    CGFloat cancelButtonOriginY =
         kMarginY + helpButtonHeight +
         (chooserController_->ShouldShowFootnoteView() ? 2 * kVerticalPadding
                                                       : 0.0f);
+    [cancelButton_
+        setFrameOrigin:NSMakePoint(cancelButtonOriginX, cancelButtonOriginY)];
+    [self addSubview:cancelButton_];
+
+    // Connect button.
+    CGFloat connectButtonOriginX =
+        kChooserWidth - kMarginX - connectButtonWidth;
+    CGFloat connectButtonOriginY = cancelButtonOriginY;
     [connectButton_
         setFrameOrigin:NSMakePoint(connectButtonOriginX, connectButtonOriginY)];
     [connectButton_ setEnabled:NO];
     [self addSubview:connectButton_];
 
-    // Cancel button.
-    CGFloat cancelButtonOriginX = kChooserWidth - kMarginX - cancelButtonWidth;
-    CGFloat cancelButtonOriginY = connectButtonOriginY;
-    [cancelButton_
-        setFrameOrigin:NSMakePoint(cancelButtonOriginX, cancelButtonOriginY)];
-    [self addSubview:cancelButton_];
-
     if (chooserController_->ShouldShowFootnoteView()) {
       // Separator.
       CGFloat separatorOriginX = 0.0f;
       separatorOriginY_ = kMarginY + helpButtonHeight + kVerticalPadding;
       [separator_
           setFrameOrigin:NSMakePoint(separatorOriginX, separatorOriginY_)];
       [self addSubview:separator_];
 
       // Help button.
       CGFloat helpButtonOriginX = kMarginX;
@@ skipping 311 matching lines @@
 
 - (void)drawRect:(NSRect)rect {
   [[NSColor colorWithCalibratedWhite:245.0f / 255.0f alpha:1.0f] setFill];
   NSRect footnoteFrame =
       NSMakeRect(0.0f, 0.0f, kChooserWidth, separatorOriginY_);
   NSRectFill(footnoteFrame);
   [super drawRect:footnoteFrame];
 }
 
 @end