Add keyboard accessibility to "Get help" link text on chooser UI

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

 // Copyright 2015 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/website_settings/chooser_bubble_ui_cocoa.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 10 matching lines @@
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
-#include "ui/base/cocoa/controls/hyperlink_text_view.h"
+#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Chooser bubble width.
 const CGFloat kChooserBubbleWidth = 320.0f;
 
@@ skipping 20 matching lines @@
  @private
   // Bridge to the C++ class that created this object.
   ChooserBubbleUiCocoa* bridge_;
 
   base::scoped_nsobject<NSTextField> titleView_;
   base::scoped_nsobject<NSScrollView> scrollView_;
   base::scoped_nsobject<NSTableColumn> tableColumn_;
   base::scoped_nsobject<NSTableView> tableView_;
   base::scoped_nsobject<NSButton> connectButton_;
   base::scoped_nsobject<NSButton> cancelButton_;
-  base::scoped_nsobject<HyperlinkTextView> message_;
+  base::scoped_nsobject<NSTextField> message_;
+  base::scoped_nsobject<NSButton> getHelpButton_;
   bool buttonPressed_;
 
   Browser* browser_;                                  // Weak.
   ChooserBubbleController* chooserBubbleController_;  // Weak.
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
 - (id)initWithBrowser:(Browser*)browser
     initWithChooserBubbleController:
         (ChooserBubbleController*)chooserBubbleController
@@ skipping 37 matching lines @@
 // Creates a button with |title| and |action|.
 - (base::scoped_nsobject<NSButton>)buttonWithTitle:(NSString*)title
                                             action:(SEL)action;
 
 // Creates the "Connect" button.
 - (base::scoped_nsobject<NSButton>)connectButton;
 
 // Creates the "Cancel" button.
 - (base::scoped_nsobject<NSButton>)cancelButton;
 
-// Creates the help link.
-- (base::scoped_nsobject<HyperlinkTextView>)message;
+// Creates the message.
+- (base::scoped_nsobject<NSTextField>)message;
+
+// Creates the "Get help" button.
+- (base::scoped_nsobject<NSButton>)getHelpButton;
 
 // Called when the "Connect" button is pressed.
 - (void)onConnect:(id)sender;
 
 // Called when the "Cancel" button is pressed.
 - (void)onCancel:(id)sender;
 
+// Called when the "Get help" button is pressed.
+- (void)onGetHelpPressed:(id)sender;
+
 @end
 
 @implementation ChooserBubbleUiController
 
 - (id)initWithBrowser:(Browser*)browser
     initWithChooserBubbleController:
         (ChooserBubbleController*)chooserBubbleController
                              bridge:(ChooserBubbleUiCocoa*)bridge {
   DCHECK(browser);
   DCHECK(chooserBubbleController);
@@ skipping 82 matching lines @@
   connectButton_ = [self connectButton];
   CGFloat connectButtonWidth = NSWidth([connectButton_ frame]);
   CGFloat connectButtonHeight = NSHeight([connectButton_ frame]);
 
   // Cancel button.
   cancelButton_ = [self cancelButton];
   CGFloat cancelButtonWidth = NSWidth([cancelButton_ frame]);
 
   // Message.
   message_ = [self message];
+  CGFloat messageWidth = NSWidth([message_ frame]);
   CGFloat messageHeight = NSHeight([message_ frame]);
 
+  // Get help button.
+  getHelpButton_ = [self getHelpButton];
+
   // Separator.
   CGFloat separatorOriginX = 0.0f;
   CGFloat separatorOriginY = kMarginY + messageHeight + kVerticalPadding;
   NSBox* separator =
       [self horizontalSeparatorWithFrame:NSMakeRect(separatorOriginX,
                                                     separatorOriginY,
                                                     kChooserBubbleWidth, 0.0f)];
 
   // ScollView embedding with TableView.
   CGFloat scrollViewWidth = kChooserBubbleWidth - 2 * kMarginX;
@@ skipping 53 matching lines @@
 
   // Separator.
   [view addSubview:separator];
 
   // Message.
   CGFloat messageOriginX = kMarginX;
   CGFloat messageOriginY = kMarginY;
   [message_ setFrameOrigin:NSMakePoint(messageOriginX, messageOriginY)];
   [view addSubview:message_];
 
+  // Get help button.
+  getHelpButton_ = [self getHelpButton];
+  CGFloat getHelpButtonOriginX =
+      kMarginX + messageWidth - kHorizontalPadding / 2;
+  CGFloat getHelpButtonOriginY = kMarginY;
+  [getHelpButton_
+      setFrameOrigin:NSMakePoint(getHelpButtonOriginX, getHelpButtonOriginY)];
+  [view addSubview:getHelpButton_];
+
   bubbleFrame = [[self window] frameRectForContentRect:bubbleFrame];
   if ([[self window] isVisible]) {
     // Unfortunately, calling -setFrame followed by -setFrameOrigin  (called
     // within -setAnchorPoint) causes flickering.  Avoid the flickering by
     // manually adjusting the new frame's origin so that the top left stays the
     // same, and only calling -setFrame.
     NSRect currentWindowFrame = [[self window] frame];
     bubbleFrame.origin = currentWindowFrame.origin;
     bubbleFrame.origin.y = bubbleFrame.origin.y +
                            currentWindowFrame.size.height -
                            bubbleFrame.size.height;
     [[self window] setFrame:bubbleFrame display:YES];
   } else {
     [[self window] setFrame:bubbleFrame display:NO];
     [self setAnchorPoint:[self getExpectedAnchorPoint]];
     [self showWindow:nil];
     [[self window] makeFirstResponder:nil];
-    [[self window] setInitialFirstResponder:connectButton_.get()];
+    [[self window] setInitialFirstResponder:tableView_.get()];
   }
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
   // When there are no devices, the table contains a message saying there are
   // no devices, so the number of rows is always at least 1.
   return std::max(
       static_cast<NSInteger>(chooserBubbleController_->NumOptions()),
       static_cast<NSInteger>(1));
 }
@@ skipping 111 matching lines @@
       l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_CONNECT_BUTTON_TEXT);
   return [self buttonWithTitle:connectTitle action:@selector(onConnect:)];
 }
 
 - (base::scoped_nsobject<NSButton>)cancelButton {
   NSString* cancelTitle =
       l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_CANCEL_BUTTON_TEXT);
   return [self buttonWithTitle:cancelTitle action:@selector(onCancel:)];
 }
 
-- (base::scoped_nsobject<HyperlinkTextView>)message {
-  base::scoped_nsobject<HyperlinkTextView> textView(
-      [[HyperlinkTextView alloc] initWithFrame:NSZeroRect]);
+- (base::scoped_nsobject<NSTextField>)message {
+  base::scoped_nsobject<NSTextField> messageView(
+      [[NSTextField alloc] initWithFrame:NSZeroRect]);
+  [messageView setDrawsBackground:NO];
+  [messageView setBezeled:NO];
+  [messageView setEditable:NO];
+  [messageView setSelectable:NO];
+  base::string16 linkString = base::ASCIIToUTF16("");

[Robert Sesek, 2016/04/04 14:52:07]

You don't need this conversion. The default ctor for string16 will be an empty
string.

[juncai, 2016/04/04 18:09:59]

Done.

+  [messageView
+      setStringValue:l10n_util::GetNSStringF(IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT,
+                                             linkString)];
+  [messageView setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
+  [messageView sizeToFit];
+  return messageView;
+}
 
-  base::string16 linkString =
-      l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_GET_HELP_LINK_TEXT);
-
-  NSString* text =
-      l10n_util::GetNSStringF(IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT, linkString);
-  [textView setMessage:text
-              withFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]
-          messageColor:[NSColor blackColor]];
-
-  NSColor* linkColor =
-      skia::SkColorToCalibratedNSColor(chrome_style::GetLinkColor());
-  [textView
-      addLinkRange:NSMakeRange([text length] - linkString.size(),
-                               linkString.size())
-           withURL:base::SysUTF8ToNSString(
-                       chooserBubbleController_->GetHelpCenterUrl().spec())
-         linkColor:linkColor];
-
-  // Removes the underlining from the link.
-  NSTextStorage* textStorage = [textView textStorage];
-  [textStorage addAttribute:NSUnderlineStyleAttributeName
-                      value:@(NSUnderlineStyleNone)
-                      range:NSMakeRange(0, [text length])];
-
-  [textView setVerticallyResizable:YES];
-  [textView
-      setFrameSize:NSMakeSize(kChooserBubbleWidth - 2 * kMarginX, MAXFLOAT)];
-  [textView sizeToFit];
-
-  return textView;
+- (base::scoped_nsobject<NSButton>)getHelpButton {
+  base::scoped_nsobject<NSButton> button(
+      [[NSButton alloc] initWithFrame:NSZeroRect]);
+  base::scoped_nsobject<HyperlinkButtonCell> cell([[HyperlinkButtonCell alloc]
+      initTextCell:l10n_util::GetNSString(
+                       IDS_CHOOSER_BUBBLE_GET_HELP_LINK_TEXT)]);
+  [button setCell:cell.get()];
+  [button sizeToFit];
+  [button setTarget:self];
+  [button setAction:@selector(onGetHelpPressed:)];
+  return button;
 }
 
 + (CGFloat)matchWidthsOf:(NSView*)viewA andOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   CGFloat width = std::max(NSWidth(frameA), NSWidth(frameB));
   [viewA setFrameSize:NSMakeSize(width, NSHeight(frameA))];
   [viewB setFrameSize:NSMakeSize(width, NSHeight(frameB))];
   return width;
 }
@@ skipping 12 matching lines @@
   chooserBubbleController_->Select(row);
   [self close];
 }
 
 - (void)onCancel:(id)sender {
   buttonPressed_ = true;
   chooserBubbleController_->Cancel();
   [self close];
 }
 
+- (void)onGetHelpPressed:(id)sender {
+  chooserBubbleController_->OpenHelpCenterUrl();
+}
+
 @end
 
 ChooserBubbleUiCocoa::ChooserBubbleUiCocoa(
     Browser* browser,
     ChooserBubbleController* chooser_bubble_controller)
     : browser_(browser),
       chooser_bubble_controller_(chooser_bubble_controller),
       chooser_bubble_ui_controller_(nil) {
   DCHECK(browser);
   DCHECK(chooser_bubble_controller);
@@ skipping 35 matching lines @@
   [chooser_bubble_ui_controller_ onOptionAdded:static_cast<NSInteger>(index)];
 }
 
 void ChooserBubbleUiCocoa::OnOptionRemoved(size_t index) {
   [chooser_bubble_ui_controller_ onOptionRemoved:static_cast<NSInteger>(index)];
 }
 
 void ChooserBubbleUiCocoa::OnBubbleClosing() {
   chooser_bubble_ui_controller_ = nil;
 }