Modify WebBluetooth chooser based on UI review feedback

chrome/browser/ui/cocoa/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/chooser_content_view_cocoa.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/chooser_controller/chooser_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #include "chrome/browser/ui/cocoa/spinner_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+#include "third_party/skia/include/core/SkColor.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
@@ skipping 29 matching lines @@
 // Separator height.
 const CGFloat kSeparatorHeight = 1.0f;
 
 // Distance between two views inside the table row view.
 const CGFloat kTableRowViewHorizontalPadding = 5.0f;
 const CGFloat kTableRowViewVerticalPadding = 1.0f;
 
 // Distance between the adapter off help link and the scroll view boundaries.
 const CGFloat kAdapterOffHelpLinkPadding = 5.0f;
 
+// Background color of the footnote view.
+const SkColor kFootnoteBackgroundColor = SkColorSetRGB(245, 245, 245);
+
 // The lookup table for signal strength level image.
 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
                                              IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
                                              IDR_SIGNAL_4_BAR};
 const int kSignalStrengthLevelImageSelectedIds[5] = {
     IDR_SIGNAL_0_BAR_SELECTED, IDR_SIGNAL_1_BAR_SELECTED,
     IDR_SIGNAL_2_BAR_SELECTED, IDR_SIGNAL_3_BAR_SELECTED,
     IDR_SIGNAL_4_BAR_SELECTED};
 
 // Creates a label with |text|.
@@ skipping 484 matching lines @@
 
     // Cancel button.
     CGFloat cancelButtonOriginX = kChooserWidth - kMarginX - cancelButtonWidth;
     CGFloat cancelButtonOriginY = connectButtonOriginY;
     [cancelButton_
         setFrameOrigin:NSMakePoint(cancelButtonOriginX, cancelButtonOriginY)];
     [self addSubview:cancelButton_];
 
     // Separator.
     CGFloat separatorOriginX = 0.0f;
-    CGFloat separatorOriginY = kMarginY + helpButtonHeight + kVerticalPadding;
-    [separator_ setFrameOrigin:NSMakePoint(separatorOriginX, separatorOriginY)];
+    separatorOriginY_ = kMarginY + helpButtonHeight + kVerticalPadding;
+    [separator_
+        setFrameOrigin:NSMakePoint(separatorOriginX, separatorOriginY_)];
     [self addSubview:separator_];
 
     // Help button.
     CGFloat helpButtonOriginX = kMarginX;
     CGFloat helpButtonOriginY = (kVerticalPadding + kMarginY) / 2;
     [helpButton_
         setFrameOrigin:NSMakePoint(helpButtonOriginX, helpButtonOriginY)];
     [helpButton_ setTarget:self];
     [helpButton_ setAction:@selector(onHelpPressed:)];
     [self addSubview:helpButton_];
@@ skipping 289 matching lines @@
       [tableView_ viewAtColumn:0 row:row makeIfNecessary:YES];
   return [tableRowView text];
 }
 
 - (NSTextField*)tableRowViewPairedStatus:(NSInteger)row {
   ChooserContentTableRowView* tableRowView =
       [tableView_ viewAtColumn:0 row:row makeIfNecessary:YES];
   return [tableRowView pairedStatus];
 }
 
+- (void)drawRect:(NSRect)rect {
+  [skia::SkColorToCalibratedNSColor(kFootnoteBackgroundColor) setFill];

[Robert Sesek, 2016/11/10 22:01:08]

I'd use +[NSColor colorWithCalibratedWhite:245.0 / 255.0 alpha:1.0] instead, to
avoid the conversion.

[juncai, 2016/11/11 01:46:33]

Done.

+  NSRect footnoteFrame = NSMakeRect(0, 0, kChooserWidth, separatorOriginY_);
+  NSRectFill(footnoteFrame);
+  [super drawRect:footnoteFrame];
+}
+
 @end