Harmonize "Ask Google for suggestions" dialog.

Change link to help (question mark) vector icon.
Removed close (X) button from ConfirmBubbleView dialog bubble.

TBR=lazyboy@chromium.org

Bug: 654139
Change-Id: I99e58f98d449d83b0aaea3aa49acfd71912a6ea5
Reviewed-on: https://chromium-review.googlesource.com/871183
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531895}

chrome/browser/renderer_context_menu/spelling_bubble_model.cc

@@ -54,12 +54,12 @@ base::string16 SpellingBubbleModel::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
-GURL SpellingBubbleModel::GetLinkURL() const {
+GURL SpellingBubbleModel::GetHelpPageURL() const {
   return GURL(chrome::kPrivacyLearnMoreURL);
 }
 
-void SpellingBubbleModel::LinkClicked() {
-  OpenURLParams params(GetLinkURL(), Referrer(),
+void SpellingBubbleModel::OpenHelpPage() {
+  OpenURLParams params(GetHelpPageURL(), Referrer(),
                        WindowOpenDisposition::NEW_FOREGROUND_TAB,
                        ui::PAGE_TRANSITION_LINK, false);
   web_contents_->OpenURL(params);

chrome/browser/renderer_context_menu/spelling_bubble_model.h

@@ -29,8 +29,8 @@ class SpellingBubbleModel : public ConfirmBubbleModel {
   void Accept() override;
   void Cancel() override;
   base::string16 GetLinkText() const override;
-  GURL GetLinkURL() const override;
-  void LinkClicked() override;
+  GURL GetHelpPageURL() const override;
+  void OpenHelpPage() override;
 
  private:
   // Set the profile preferences to enable or disable the feature.

chrome/browser/ui/ask_google_for_suggestions_dialog_browsertest.cc

@@ -32,15 +32,7 @@ class AskGoogleForSuggestionsDialogTest : public DialogBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(AskGoogleForSuggestionsDialogTest);
 };
 
-#if !defined(OS_MACOSX)
-// Initially disabled except on Mac due to http://crbug.com/683808.
-#define MAYBE_InvokeUi_default DISABLED_InvokeUi_default
-#else
-#define MAYBE_InvokeUi_default InvokeUi_default
-#endif
-
 // Test that calls ShowUi("default").
-IN_PROC_BROWSER_TEST_F(AskGoogleForSuggestionsDialogTest,
-                       MAYBE_InvokeUi_default) {
+IN_PROC_BROWSER_TEST_F(AskGoogleForSuggestionsDialogTest, InvokeUi_default) {
   ShowAndVerifyUi();
 }

chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm

@@ -128,7 +128,7 @@ const int kButtonHEdgeMargin = 7;
 - (BOOL)textView:(NSTextView*)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
-  [controller_ linkClicked];
+  [controller_ openHelpPage];
   [self closeBubble];
   return YES;
 }
@@ -195,8 +195,7 @@ const int kButtonHEdgeMargin = 7;
     base::scoped_nsobject<NSAttributedString> whiteSpace(
         [[NSAttributedString alloc] initWithString:@" "]);
     [attributedMessage.get() appendAttributedString:whiteSpace.get()];
-    [attributes setObject:[controller_ linkURL]
-                   forKey:NSLinkAttributeName];
+    [attributes setObject:[controller_ helpPageURL] forKey:NSLinkAttributeName];
     base::scoped_nsobject<NSAttributedString> attributedLink(
         [[NSAttributedString alloc] initWithString:linkText
                                         attributes:attributes]);

chrome/browser/ui/cocoa/confirm_bubble_controller.h

@@ -35,7 +35,7 @@ class ConfirmBubbleModel;
 - (NSString*)title;
 - (NSString*)messageText;
 - (NSString*)linkText;
-- (NSString*)linkURL;
+- (NSString*)helpPageURL;
 - (NSString*)okButtonText;
 - (NSString*)cancelButtonText;
 - (BOOL)hasOkButton;
@@ -44,7 +44,7 @@ class ConfirmBubbleModel;
 // Handle actions from the ConfirmBubbleCocoa object.
 - (void)accept;
 - (void)cancel;
-- (void)linkClicked;
+- (void)openHelpPage;
 
 @end
 

chrome/browser/ui/cocoa/confirm_bubble_controller.mm

@@ -53,8 +53,8 @@
   return base::SysUTF16ToNSString(model_->GetLinkText());
 }
 
-- (NSString*)linkURL {
-  return base::SysUTF8ToNSString(model_->GetLinkURL().spec());
+- (NSString*)helpPageURL {
+  return base::SysUTF8ToNSString(model_->GetHelpPageURL().spec());
 }
 
 - (NSString*)okButtonText {
@@ -84,8 +84,8 @@
   model_->Cancel();
 }
 
-- (void)linkClicked {
-  model_->LinkClicked();
+- (void)openHelpPage {
+  model_->OpenHelpPage();
 }
 
 @end

chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm

@@ -32,7 +32,7 @@ class TestConfirmBubbleModel : public ConfirmBubbleModel {
   void Accept() override;
   void Cancel() override;
   base::string16 GetLinkText() const override;
-  void LinkClicked() override;
+  void OpenHelpPage() override;
 
  private:
   bool* accept_clicked_;
@@ -77,7 +77,7 @@ base::string16 TestConfirmBubbleModel::GetLinkText() const {
   return base::ASCIIToUTF16("Link");
 }
 
-void TestConfirmBubbleModel::LinkClicked() {
+void TestConfirmBubbleModel::OpenHelpPage() {
   *link_clicked_ = true;
 }
 

chrome/browser/ui/confirm_bubble_model.cc

@@ -32,9 +32,8 @@ base::string16 ConfirmBubbleModel::GetLinkText() const {
   return base::string16();
 }
 
-GURL ConfirmBubbleModel::GetLinkURL() const {
+GURL ConfirmBubbleModel::GetHelpPageURL() const {
   return GURL();
 }
 
-void ConfirmBubbleModel::LinkClicked() {
-}
+void ConfirmBubbleModel::OpenHelpPage() {}

chrome/browser/ui/confirm_bubble_model.h

@@ -50,10 +50,10 @@ class ConfirmBubbleModel {
   virtual base::string16 GetLinkText() const;
 
   // Returns the URL of the link to be displayed.
-  virtual GURL GetLinkURL() const;
+  virtual GURL GetHelpPageURL() const;
 
   // Called when the link is clicked.
-  virtual void LinkClicked();
+  virtual void OpenHelpPage();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConfirmBubbleModel);

chrome/browser/ui/test/test_confirm_bubble_model.cc

@@ -54,7 +54,7 @@ base::string16 TestConfirmBubbleModel::GetLinkText() const {
   return base::ASCIIToUTF16("Link");
 }
 
-void TestConfirmBubbleModel::LinkClicked() {
+void TestConfirmBubbleModel::OpenHelpPage() {
   if (link_clicked_)
     *link_clicked_ = true;
 }

chrome/browser/ui/test/test_confirm_bubble_model.h

@@ -27,7 +27,7 @@ class TestConfirmBubbleModel : public ConfirmBubbleModel {
   void Accept() override;
   void Cancel() override;
   base::string16 GetLinkText() const override;
-  void LinkClicked() override;
+  void OpenHelpPage() override;
 
  private:
   bool* model_deleted_;

chrome/browser/ui/views/confirm_bubble_views.cc

@@ -11,15 +11,17 @@
 #include "chrome/browser/ui/confirm_bubble_model.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/constrained_window/constrained_window_views.h"
+#include "components/vector_icons/vector_icons.h"
 #include "ui/base/ui_features.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 ConfirmBubbleViews::ConfirmBubbleViews(
     std::unique_ptr<ConfirmBubbleModel> model)
-    : model_(std::move(model)), link_(NULL) {
+    : model_(std::move(model)), help_button_(nullptr) {
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
   views::GridLayout* layout =
@@ -40,10 +42,9 @@ ConfirmBubbleViews::ConfirmBubbleViews(
   layout->StartRow(0, 0);
   layout->AddView(label);
 
-  // Initialize the link.
-  link_ = new views::Link(model_->GetLinkText());
-  link_->set_listener(this);
-  link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  // Initialize the help button.
+  help_button_ = CreateVectorImageButton(this);
+  SetImageFromVectorIcon(help_button_, vector_icons::kHelpOutlineIcon);
 
   chrome::RecordDialogCreation(chrome::DialogIdentifier::CONFIRM_BUBBLE);
 }
@@ -77,7 +78,7 @@ bool ConfirmBubbleViews::IsDialogButtonEnabled(ui::DialogButton button) const {
 }
 
 views::View* ConfirmBubbleViews::CreateExtraView() {
-  return link_;
+  return help_button_;
 }
 
 bool ConfirmBubbleViews::Cancel() {
@@ -98,9 +99,14 @@ base::string16 ConfirmBubbleViews::GetWindowTitle() const {
   return model_->GetTitle();
 }
 
-void ConfirmBubbleViews::LinkClicked(views::Link* source, int event_flags) {
-  if (source == link_) {
-    model_->LinkClicked();
+bool ConfirmBubbleViews::ShouldShowCloseButton() const {
+  return false;
+}
+
+void ConfirmBubbleViews::ButtonPressed(views::Button* sender,
+                                       const ui::Event& event) {
+  if (sender == help_button_) {
+    model_->OpenHelpPage();
     GetWidget()->Close();
   }
 }

chrome/browser/ui/views/confirm_bubble_views.h

@@ -9,22 +9,26 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "ui/views/controls/link_listener.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/window/dialog_delegate.h"
 
 class ConfirmBubbleModel;
 
-// A dialog (with the standard Title/(x)/[OK]/[Cancel] UI elements), as well as
-// a message Label and optional Link. The dialog ultimately appears like this:
+namespace views {
+class ImageButton;
+}
+
+// A dialog (with the standard Title/[OK]/[Cancel] UI elements), as well as
+// a message Label and help (?) button. The dialog ultimately appears like this:
 //   +------------------------+
-//   | Title              (x) |
+//   | Title                  |
 //   | Label                  |
-//   | Link     [OK] [Cancel] |
+//   | (?)      [OK] [Cancel] |
 //   +------------------------+
 //
 // TODO(msw): Remove this class or merge it with DialogDelegateView.
 class ConfirmBubbleViews : public views::DialogDelegateView,
-                           public views::LinkListener {
+                           public views::ButtonListener {
  public:
   explicit ConfirmBubbleViews(std::unique_ptr<ConfirmBubbleModel> model);
 
@@ -41,15 +45,16 @@ class ConfirmBubbleViews : public views::DialogDelegateView,
   // views::WidgetDelegate implementation.
   ui::ModalType GetModalType() const override;
   base::string16 GetWindowTitle() const override;
+  bool ShouldShowCloseButton() const override;
 
-  // views::LinkListener implementation.
-  void LinkClicked(views::Link* source, int event_flags) override;
+  // views::ButtonListener implementation.
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
  private:
   // The model to customize this bubble view.
   std::unique_ptr<ConfirmBubbleModel> model_;
 
-  views::Link* link_;
+  views::ImageButton* help_button_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmBubbleViews);
 };