Allow dialogs to use a custom View as their title.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_features.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
-#include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/desktop_ios_promotion/desktop_ios_promotion_bubble_view.h"
@@ skipping 111 matching lines @@
       break;
   }
 }
 
 views::StyledLabel::RangeStyleInfo GetLinkStyle() {
   auto result = views::StyledLabel::RangeStyleInfo::CreateForLink();
   result.disable_line_wrapping = false;
   return result;
 }
 
-// If a special title is required (i.e. one that contains links), creates a
-// title view and a row for it in |layout|.
-// TODO(estade): this should be removed and a replaced by a normal title (via
-// GetWindowTitle).
-void AddTitleRowWithLink(views::GridLayout* layout,
-                         ManagePasswordsBubbleModel* model,
-                         views::StyledLabelListener* listener) {
-  if (model->title_brand_link_range().is_empty())
-    return;
-
-  views::StyledLabel* title_label =
-      new views::StyledLabel(model->title(), listener);
-  title_label->SetBaseFontList(views::style::GetFont(
-      views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
-  title_label->AddStyleRange(model->title_brand_link_range(), GetLinkStyle());
-  layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
-  layout->AddView(title_label);
-  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()
-                               ->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS)
-                               .top());
-}
-
 }  // namespace
 
 // ManagePasswordsBubbleView::AutoSigninView ----------------------------------
 
 // A view containing just one credential that was used for for automatic signing
 // in.
 class ManagePasswordsBubbleView::AutoSigninView
     : public views::View,
       public views::ButtonListener,
       public views::WidgetObserver {
@@ skipping 78 matching lines @@
 void ManagePasswordsBubbleView::AutoSigninView::OnTimer() {
   parent_->model()->OnAutoSignInToastTimeout();
   parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 // A view offering the user the ability to save credentials. Contains a
 // single ManagePasswordItemsView, along with a "Save Passwords" button
 // and a "Never" button.
-class ManagePasswordsBubbleView::PendingView
-    : public views::View,
-      public views::ButtonListener,
-      public views::StyledLabelListener {
+class ManagePasswordsBubbleView::PendingView : public views::View,
+                                               public views::ButtonListener {
  public:
   explicit PendingView(ManagePasswordsBubbleView* parent);
   ~PendingView() override;
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // views::StyledLabelListener:
-  void StyledLabelLinkClicked(views::StyledLabel* label,
-                              const gfx::Range& range,
-                              int event_flags) override;
-
   ManagePasswordsBubbleView* parent_;
 
   views::Button* save_button_;
   views::Button* never_button_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingView);
 };
 
 ManagePasswordsBubbleView::PendingView::PendingView(
     ManagePasswordsBubbleView* parent)
     : parent_(parent) {
   views::GridLayout* layout = new views::GridLayout(this);
   layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
   SetLayoutManager(layout);
 
   // Create the pending credential item, save button and refusal combobox.
   ManagePasswordItemsView* item = nullptr;
   if (!parent->model()->pending_password().username_value.empty()) {
     item = new ManagePasswordItemsView(parent_->model(),
                                        &parent->model()->pending_password());
   }
   save_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
   never_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this,
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BUBBLE_BLACKLIST_BUTTON));
 
-  // Title row.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
-  AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   if (item) {
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
     layout->AddPaddingRow(0,
                           ChromeLayoutProvider::Get()
                               ->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS)
                               .bottom());
   }
@@ skipping 21 matching lines @@
     }
   } else if (sender == never_button_) {
     parent_->model()->OnNeverForThisSiteClicked();
   } else {
     NOTREACHED();
   }
 
   parent_->CloseBubble();
 }
 
-void ManagePasswordsBubbleView::PendingView::StyledLabelLinkClicked(
-    views::StyledLabel* label,
-    const gfx::Range& range,
-    int event_flags) {
-  DCHECK_EQ(range, parent_->model()->title_brand_link_range());
-  parent_->model()->OnBrandLinkClicked();
-}
-
 // ManagePasswordsBubbleView::ManageView --------------------------------------
 
 // A view offering the user a list of their currently saved credentials
 // for the current page, along with a "Manage passwords" link and a
 // "Done" button.
 class ManagePasswordsBubbleView::ManageView : public views::View,
                                               public views::ButtonListener,
                                               public views::LinkListener {
  public:
   explicit ManageView(ManagePasswordsBubbleView* parent);
@@ skipping 220 matching lines @@
 }
 
 // ManagePasswordsBubbleView::UpdatePendingView -------------------------------
 
 // A view offering the user the ability to update credentials. Contains a
 // single ManagePasswordItemsView (in case of one credentials) or
 // CredentialsSelectionView otherwise, along with a "Update Passwords" button
 // and a rejection button.
 class ManagePasswordsBubbleView::UpdatePendingView
     : public views::View,
-      public views::ButtonListener,
-      public views::StyledLabelListener {
+      public views::ButtonListener {
  public:
   explicit UpdatePendingView(ManagePasswordsBubbleView* parent);
   ~UpdatePendingView() override;
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // views::StyledLabelListener:
-  void StyledLabelLinkClicked(views::StyledLabel* label,
-                              const gfx::Range& range,
-                              int event_flags) override;
-
   ManagePasswordsBubbleView* parent_;
 
   CredentialsSelectionView* selection_view_;
 
   views::Button* update_button_;
   views::Button* nope_button_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdatePendingView);
 };
 
@@ skipping 13 matching lines @@
   } else {
     item = new ManagePasswordItemsView(parent_->model(),
                                        &parent->model()->pending_password());
   }
   nope_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_CANCEL_BUTTON));
 
   update_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
       this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_UPDATE_BUTTON));
 
-  // Title row.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
-  AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(item);
   layout->AddPaddingRow(
       0,
       layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS).bottom());
 
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
@@ skipping 19 matching lines @@
           *selection_view_->GetSelectedCredentials());
     } else {
       parent_->model()->OnUpdateClicked(parent_->model()->pending_password());
     }
   } else {
     parent_->model()->OnNopeUpdateClicked();
   }
   parent_->CloseBubble();
 }
 
-void ManagePasswordsBubbleView::UpdatePendingView::StyledLabelLinkClicked(
-    views::StyledLabel* label,
-    const gfx::Range& range,
-    int event_flags) {
-  DCHECK_EQ(range, parent_->model()->title_brand_link_range());
-  parent_->model()->OnBrandLinkClicked();
-}
-
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 #if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 // static
 void ManagePasswordsBubbleView::ShowBubble(
     content::WebContents* web_contents,
@@ skipping 58 matching lines @@
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
     views::View* anchor_view,
     const gfx::Point& anchor_point,
     DisplayReason reason)
     : LocationBarBubbleDelegateView(anchor_view, anchor_point, web_contents),
       model_(PasswordsModelDelegateFromWebContents(web_contents),
              reason == AUTOMATIC ? ManagePasswordsBubbleModel::AUTOMATIC
                                  : ManagePasswordsBubbleModel::USER_ACTION),
-      initially_focused_view_(nullptr) {
+      initially_focused_view_(nullptr),
+      title_view_(nullptr) {
   mouse_handler_.reset(new WebContentMouseHandler(this, this->web_contents()));
   manage_passwords_bubble_ = this;
   chrome::RecordDialogCreation(chrome::DialogIdentifier::MANAGE_PASSWORDS);
 }
 
 ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
   if (manage_passwords_bubble_ == this)
     manage_passwords_bubble_ = nullptr;
 }
 
@@ skipping 10 matching lines @@
   SetLayoutManager(new views::FillLayout);
 
   CreateChild();
 }
 
 void ManagePasswordsBubbleView::CloseBubble() {
   mouse_handler_.reset();
   LocationBarBubbleDelegateView::CloseBubble();
 }
 
+void ManagePasswordsBubbleView::AddedToWidget() {
+  title_view_ = new views::StyledLabel(base::string16(), this);
+  title_view_->SetBaseFontList(views::style::GetFont(
+      views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
+  UpdateTitleText();
+  GetBubbleFrameView()->SetTitleView(title_view_);
+}
+
+void ManagePasswordsBubbleView::UpdateTitleText() {
+  title_view_->SetText(GetWindowTitle());

[Peter Kasting, 2017/06/23 06:00:09]

Same comment applies as in ManagePasswordsBubbleView.

[Bret, 2017/06/24 01:12:33]

Done.

+  if (!model_.title_brand_link_range().is_empty())
+    title_view_->AddStyleRange(model_.title_brand_link_range(), GetLinkStyle());
+}
+
 base::string16 ManagePasswordsBubbleView::GetWindowTitle() const {
   return model_.title();
 }
 
 gfx::ImageSkia ManagePasswordsBubbleView::GetWindowIcon() {
 #if defined(OS_WIN)
   if (model_.state() == password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     return desktop_ios_promotion::GetPromoImage(
         GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_TextfieldDefaultColor));
   }
 #endif
   return gfx::ImageSkia();
 }
 
-bool ManagePasswordsBubbleView::ShouldShowWindowTitle() const {
-  // Since bubble titles don't support links, fall back to a custom title view
-  // if we need to show a link. Only use the normal title path if there's no
-  // link.
-  return model_.title_brand_link_range().is_empty();
-}
-
 bool ManagePasswordsBubbleView::ShouldShowWindowIcon() const {
   return model_.state() == password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE;
 }
 
 bool ManagePasswordsBubbleView::ShouldShowCloseButton() const {
   return model_.state() == password_manager::ui::PENDING_PASSWORD_STATE ||
          model_.state() == password_manager::ui::CHROME_SIGN_IN_PROMO_STATE ||
          model_.state() == password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE;
 }
 
+void ManagePasswordsBubbleView::StyledLabelLinkClicked(
+    views::StyledLabel* label,
+    const gfx::Range& range,
+    int event_flags) {
+  DCHECK_EQ(model_.title_brand_link_range(), range);
+  model_.OnBrandLinkClicked();
+}
+
 void ManagePasswordsBubbleView::Refresh() {
   RemoveAllChildViews(true);
   initially_focused_view_ = NULL;
   CreateChild();
   // Show/hide the close button.
   GetWidget()->non_client_view()->ResetWindowControls();
   GetWidget()->UpdateWindowIcon();
-  GetWidget()->UpdateWindowTitle();
+  UpdateTitleText();
   if (model_.state() == password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     // Update the height and keep the existing width.
     gfx::Rect bubble_bounds = GetWidget()->GetWindowBoundsInScreen();
     bubble_bounds.set_height(
         GetWidget()->GetRootView()->GetHeightForWidth(bubble_bounds.width()));
     GetWidget()->SetBounds(bubble_bounds);
   } else {
     SizeToContents();
   }
 }
@@ skipping 15 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }