Use standard icon/title in global error bubble

ui/views/window/dialog_delegate_unittest.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 "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 namespace {
 
 class TestDialog : public DialogDelegateView, public ButtonListener {
  public:
   TestDialog()
       : canceled_(false),
         accepted_(false),
         closeable_(false),
         last_pressed_button_(NULL) {}
   ~TestDialog() override {}
 
+  // WidgetDelegate overrides:
+  bool ShouldShowWindowTitle() const override {
+    return !title_.empty();
+  }
+
   // DialogDelegateView overrides:
   bool Cancel() override {
     canceled_ = true;
     return closeable_;
   }
   bool Accept() override {
     accepted_ = true;
     return closeable_;
   }
 
@@ skipping 137 matching lines @@
   dialog()->GetFocusManager()->OnKeyEvent(return_key);
   dialog()->CheckAndResetStates(true, false, NULL);
 }
 
 TEST_F(DialogTest, RemoveDefaultButton) {
   // Removing buttons from the dialog here should not cause a crash on close.
   delete dialog()->GetDialogClientView()->ok_button();
   delete dialog()->GetDialogClientView()->cancel_button();
 }
 
-TEST_F(DialogTest, HitTest) {
-  // Ensure that the new style's BubbleFrameView hit-tests as expected.
+TEST_F(DialogTest, HitTest_HiddenTitle) {
+  // Ensure that the new style's BubbleFrameView hit-tests as expected

[msw, 2015/02/24 22:19:46]

nit: remove "the new style's" and s/when title/when the title/. This should be a
one-liner as "// Ensure that BubbleFrameView hit-tests as expected when the
title is hidden."

[xiaoling, 2015/02/24 22:38:29]

Done.

+  // when title is hidden.
   const NonClientView* view = dialog()->GetWidget()->non_client_view();
   BubbleFrameView* frame = static_cast<BubbleFrameView*>(view->frame_view());
   const int border = frame->bubble_border()->GetBorderThickness();
 
   struct {
     const int point;
     const int hit;
   } cases[] = {
     { border,      HTSYSMENU },
     { border + 10, HTSYSMENU },
+    { border + 20, HTCLIENT  },
+    { border + 50, HTCLIENT  },
+    { border + 60, HTCLIENT  },
+    { 1000,        HTNOWHERE },
+  };
+
+  for (size_t i = 0; i < arraysize(cases); ++i) {
+    gfx::Point point(cases[i].point, cases[i].point);
+    EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
+        << " with border: " << border << ", at point " << cases[i].point;
+  }
+}
+
+TEST_F(DialogTest, HitTest_WithTitle) {
+  // Ensure that the new style's BubbleFrameView hit-tests as expected

[msw, 2015/02/24 22:19:46]

nit: remove "the new style's" here and below; s/when title is present/when the
title is /. This should be a one-liner as "// Ensure that BubbleFrameView
hit-tests as expected when the title is shown."

[xiaoling, 2015/02/24 22:38:29]

Done.

+  // when title is present.
+  const NonClientView* view = dialog()->GetWidget()->non_client_view();
+  dialog()->set_title(base::ASCIIToUTF16("Title"));
+  dialog()->GetWidget()->UpdateWindowTitle();
+  BubbleFrameView* frame = static_cast<BubbleFrameView*>(view->frame_view());
+  const int border = frame->bubble_border()->GetBorderThickness();
+
+  struct {
+    const int point;
+    const int hit;
+  } cases[] = {
+    { border,      HTSYSMENU },
+    { border + 10, HTSYSMENU },
     { border + 20, HTCAPTION },
-    { border + 40, HTCLIENT  },
     { border + 50, HTCLIENT  },
+    { border + 60, HTCLIENT  },
     { 1000,        HTNOWHERE },
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     gfx::Point point(cases[i].point, cases[i].point);
     EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
         << " with border: " << border << ", at point " << cases[i].point;
   }
 }
 
 TEST_F(DialogTest, BoundsAccommodateTitle) {
   TestDialog* dialog2(new TestDialog());
   dialog2->set_title(base::ASCIIToUTF16("Title"));
   DialogDelegate::CreateDialogWidget(dialog2, GetContext(), NULL);
 
   // Titled dialogs have taller initial frame bounds than untitled dialogs.
   View* frame1 = dialog()->GetWidget()->non_client_view()->frame_view();
   View* frame2 = dialog2->GetWidget()->non_client_view()->frame_view();
   EXPECT_LT(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   // Giving the default test dialog a title will yield the same bounds.
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   EXPECT_EQ(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 }
 
 }  // namespace views