Use standard icon/title in global error bubble

chrome/browser/ui/views/global_error_bubble_view.cc

 // Copyright (c) 2012 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/global_error_bubble_view.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/views/elevation_icon_setter.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 enum {
   TAG_ACCEPT_BUTTON = 1,
   TAG_CANCEL_BUTTON,
 };
 
 const int kMaxBubbleViewWidth = 262;
 
-// The horizontal padding between the title and the icon.
-const int kTitleHorizontalPadding = 5;
-
 // The vertical inset of the wrench bubble anchor from the wrench menu button.
 const int kAnchorVerticalInset = 5;
 
 const int kBubblePadding = 6;
 
 }  // namespace
 
 // GlobalErrorBubbleViewBase ---------------------------------------------------
 
 // static
@@ skipping 19 matching lines @@
     views::BubbleBorder::Arrow arrow,
     Browser* browser,
     const base::WeakPtr<GlobalErrorWithStandardBubble>& error)
     : BubbleDelegateView(anchor_view, arrow),
       browser_(browser),
       error_(error) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(
       gfx::Insets(kAnchorVerticalInset, 0, kAnchorVerticalInset, 0));
 
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::Image image = error_->GetBubbleViewIcon();
-  CHECK(!image.IsEmpty());
-  scoped_ptr<views::ImageView> image_view(new views::ImageView());
-  image_view->SetImage(image.ToImageSkia());
-
-  base::string16 title_string(error_->GetBubbleViewTitle());
-  scoped_ptr<views::Label> title_label(new views::Label(title_string));
-  title_label->SetMultiLine(true);
-  title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  title_label->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
-
   std::vector<base::string16> message_strings(error_->GetBubbleViewMessages());
   std::vector<views::Label*> message_labels;
   for (size_t i = 0; i < message_strings.size(); ++i) {
     views::Label* message_label = new views::Label(message_strings[i]);
     message_label->SetMultiLine(true);
     message_label->SizeToFit(kMaxBubbleViewWidth);
     message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_labels.push_back(message_label);
   }
 
   base::string16 accept_string(error_->GetBubbleViewAcceptButtonLabel());
   scoped_ptr<views::LabelButton> accept_button(
       new views::LabelButton(this, accept_string));
   accept_button->SetStyle(views::Button::STYLE_BUTTON);
   accept_button->SetIsDefault(true);
   accept_button->set_tag(TAG_ACCEPT_BUTTON);
   if (error_->ShouldAddElevationIconToAcceptButton())
     elevation_icon_setter_.reset(new ElevationIconSetter(accept_button.get()));
 
   base::string16 cancel_string(error_->GetBubbleViewCancelButtonLabel());
   scoped_ptr<views::LabelButton> cancel_button;
   if (!cancel_string.empty()) {
     cancel_button.reset(new views::LabelButton(this, cancel_string));
     cancel_button->SetStyle(views::Button::STYLE_BUTTON);
     cancel_button->set_tag(TAG_CANCEL_BUTTON);
   }
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
-  layout->SetInsets(kBubblePadding, kBubblePadding,
-                    kBubblePadding, kBubblePadding);
 
-  // Top row, icon and title.
+  // BubbleFrameView adds enough padding below title, no top padding needed.
+  layout->SetInsets(0, kBubblePadding, kBubblePadding, kBubblePadding);
+
+  // First row, message labels.
   views::ColumnSet* cs = layout->AddColumnSet(0);
-  cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
-                0, views::GridLayout::USE_PREF, 0, 0);
-  cs->AddPaddingColumn(0, kTitleHorizontalPadding);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                 1, views::GridLayout::USE_PREF, 0, 0);
 
-  // Middle rows, message labels.
+  // Second row, accept and cancel button.
   cs = layout->AddColumnSet(1);
-  cs->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                1, views::GridLayout::USE_PREF, 0, 0);
-
-  // Bottom row, accept and cancel button.
-  cs = layout->AddColumnSet(2);
   cs->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING,
                 0, views::GridLayout::USE_PREF, 0, 0);
   if (cancel_button.get()) {
     cs->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
     cs->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING,
                   0, views::GridLayout::USE_PREF, 0, 0);
   }
 
-  layout->StartRow(1, 0);
-  layout->AddView(image_view.release());
-  layout->AddView(title_label.release());
-  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-
   for (size_t i = 0; i < message_labels.size(); ++i) {
-    layout->StartRow(1, 1);
+    layout->StartRow(1, 0);
     layout->AddView(message_labels[i]);
     if (i < message_labels.size() - 1)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   layout->AddPaddingRow(0, views::kLabelToControlVerticalSpacing);
 
-  layout->StartRow(0, 2);
+  layout->StartRow(0, 1);
   layout->AddView(accept_button.release());
   if (cancel_button.get())
     layout->AddView(cancel_button.release());
 
   // Adjust the message label size in case buttons are too long.
   for (size_t i = 0; i < message_labels.size(); ++i)
     message_labels[i]->SizeToFit(layout->GetPreferredSize(this).width());
 
   // These bubbles show at times where activation is sporadic (like at startup,
   // or a new window opening). Make sure the bubble doesn't disappear before the
@@ skipping 18 matching lines @@
       NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
   if (error_)
     error_->BubbleViewDidClose(browser_);
 }
 
+bool GlobalErrorBubbleView::ShouldShowWindowTitle() const {
+  return true;

[msw, 2015/02/19 23:56:14]

You shouldn't need to override this, WidgetDelegateView already returns true.
(unless you want to do something like [D]CHECK(!GetWindowTitle().empty()))

[xiaoling, 2015/02/20 19:43:21]

Done.

+}
+
+base::string16 GlobalErrorBubbleView::GetWindowTitle() const {
+  return error_->GetBubbleViewTitle();
+}
+
+bool GlobalErrorBubbleView::ShouldShowWindowIcon() const {
+  return true;
+}
+
+gfx::ImageSkia GlobalErrorBubbleView::GetWindowIcon() {
+  gfx::Image image = error_->GetBubbleViewIcon();
+  CHECK(!image.IsEmpty());

[msw, 2015/02/19 23:56:13]

Do all global error bubbles really have valid icons? Maybe DCHECK?

[xiaoling, 2015/02/20 19:43:21]

Done.

+  return *image.ToImageSkia();
+}
+
 bool GlobalErrorBubbleView::ShouldShowCloseButton() const {
   return error_ && error_->ShouldShowCloseButton();
 }
 
 void GlobalErrorBubbleView::CloseBubbleView() {
   GetWidget()->Close();
 }