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

chrome/browser/ui/cocoa/chooser_content_view_cocoa.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_CHOOSER_CONTENT_VIEW_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_CHOOSER_CONTENT_VIEW_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
 #include "base/mac/scoped_nsobject.h"
 
 class ChooserContentViewController;
 class ChooserController;
 @class SpinnerView;
 
 // A chooser content view class that user can select an option.
 @interface ChooserContentViewCocoa : NSView {
  @private
   base::scoped_nsobject<NSTextField> titleView_;
   base::scoped_nsobject<NSButton> adapterOffHelpButton_;
   base::scoped_nsobject<NSTextField> adapterOffMessage_;
   base::scoped_nsobject<NSScrollView> scrollView_;
   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.
 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle
                    chooserController:
                        (std::unique_ptr<ChooserController>)chooserController;
 
 // Creates the title for the chooser.
 - (base::scoped_nsobject<NSTextField>)createChooserTitle:(NSString*)title;
 
@@ skipping 12 matching lines @@
 // Creates the "Cancel" button.
 - (base::scoped_nsobject<NSButton>)createCancelButton;
 
 // Creates the separator.
 - (base::scoped_nsobject<NSBox>)createSeparator;
 
 // Creates a hyperlink button with |text|.
 - (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;
 
 // Gets the table view for the chooser.
 - (NSTableView*)tableView;
 
 // 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;
 
 // Gets the "Cancel" button.
 - (NSButton*)cancelButton;
 
 // 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;
 
 // The |index|th option string which is listed in the chooser.
 - (NSString*)optionAtIndex:(NSInteger)index;
 
 // Update |tableView_| when chooser options changed.
 - (void)updateTableView;
 
 // Called when the "Connect" button is pressed.
@@ skipping 23 matching lines @@
 // Gets the text from table row view. For testing and internal use only.
 - (NSTextField*)tableRowViewText:(NSInteger)row;
 
 // Gets the paired status from table row view. For testing and internal use
 // only.
 - (NSTextField*)tableRowViewPairedStatus:(NSInteger)row;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_CHOOSER_CONTENT_VIEW_COCOA_H_