Make WebBluetooth chooser consistent on Android and desktops (desktop part)

chrome/browser/ui/cocoa/chooser_content_view_cocoa.h

Index: chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
diff --git a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
index a8d282c9d1b2dcc4ff6a6280b808b428736b0774..7ad1f6efd2441164f6803c6ccc54dbaf4945aae9 100644
--- a/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
+++ b/chrome/browser/ui/cocoa/chooser_content_view_cocoa.h
@@ -25,43 +25,15 @@ class ChooserController;
   base::scoped_nsobject<NSTableColumn> tableColumn_;
   base::scoped_nsobject<NSTableView> tableView_;
   base::scoped_nsobject<SpinnerView> spinner_;
-  base::scoped_nsobject<NSTextField> status_;
-  base::scoped_nsobject<NSButton> rescanButton_;
   base::scoped_nsobject<NSButton> connectButton_;
   base::scoped_nsobject<NSButton> cancelButton_;
   base::scoped_nsobject<NSBox> separator_;
-  base::scoped_nsobject<NSTextField> message_;
   base::scoped_nsobject<NSButton> helpButton_;
+  base::scoped_nsobject<NSTextField> scanningMessage_;
+  base::scoped_nsobject<NSTextField> wordConnector_;
+  base::scoped_nsobject<NSButton> rescanButton_;
   std::unique_ptr<ChooserController> chooserController_;
   std::unique_ptr<ChooserContentViewController> chooserContentViewController_;
-
-  CGFloat titleHeight_;
-  CGFloat statusHeight_;
-  CGFloat rescanButtonHeight_;
-  CGFloat connectButtonWidth_;
-  CGFloat connectButtonHeight_;
-  CGFloat cancelButtonWidth_;
-  CGFloat cancelButtonHeight_;
-  CGFloat messageHeight_;
-
-  struct FrameAndOrigin {
-    NSRect scroll_view_frame;
-    NSPoint connect_button_origin;
-    NSPoint cancel_button_origin;
-  };
-
-  // The cached |scrollView_| frame and |connectButton_| and |cancelButton_|
-  // origins for views layout:
-  // When |status_| is shown.
-  FrameAndOrigin statusShown_;
-  // When |rescanButton_| is shown.
-  FrameAndOrigin rescanButtonShown_;
-  // When neither |status_| nor |rescanButton_| is shown.
-  FrameAndOrigin noStatusOrRescanButtonShown_;
-
-  // The cached |status_| and |rescanButton_| origins.
-  NSPoint statusOrigin_;
-  NSPoint rescanButtonOrigin_;
 }
 
 // Designated initializer.
@@ -94,24 +66,6 @@ class ChooserController;
 - (base::scoped_nsobject<NSButton>)createHyperlinkButtonWithText:
     (NSString*)text;
 
-// Calculates the frame for the |scrollView_|.
-- (NSRect)calculateScrollViewFrame:(CGFloat)buttonRowHeight;
-
-// Calculates the origin for the |status_| text.
-- (NSPoint)calculateStatusOrigin:(CGFloat)buttonRowHeight;
-
-// Calculates the origin for the "Re-scan" button.
-- (NSPoint)calculateRescanButtonOrigin:(CGFloat)buttonRowHeight;
-
-// Calculates the origin for the "Connect" button.
-- (NSPoint)calculateConnectButtonOrigin:(CGFloat)buttonRowHeight;
-
-// Calculates the origin for the "Cancel" button.
-- (NSPoint)calculateCancelButtonOrigin:(CGFloat)buttonRowHeight;
-
-// Updates the origin and size of the view.
-- (void)updateView;
-
 // Gets the adapter off help button.
 - (NSButton*)adapterOffHelpButton;
 
@@ -121,12 +75,6 @@ class ChooserController;
 // Gets the spinner.
 - (SpinnerView*)spinner;
 
-// Gets the status text field.
-- (NSTextField*)status;
-
-// Gets the "Re-scan" button.
-- (NSButton*)rescanButton;
-
 // Gets the "Connect" button.
 - (NSButton*)connectButton;
 
@@ -136,6 +84,15 @@ class ChooserController;
 // Gets the "Get help" button.
 - (NSButton*)helpButton;
 
+// Gets the scanning message.
+- (NSTextField*)scanningMessage;
+
+// Gets the word connector.
+- (NSTextField*)wordConnector;
+
+// Gets the "Re-scan" button.
+- (NSButton*)rescanButton;
+
 // The number of options in the |tableView_|.
 - (NSInteger)numberOfOptions;