Restore Views dialog dragging and titlebar system menus.

ui/views/bubble/bubble_frame_view_unittest.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 "ui/base/hit_test.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 typedef ViewsTestBase BubbleFrameViewTest;
 
 namespace {
 
 const BubbleBorder::Arrow kArrow = BubbleBorder::TOP_LEFT;
 const int kBubbleWidth = 200;
 const int kBubbleHeight = 200;
 const SkColor kColor = SK_ColorRED;
 const int kMargin = 6;
 
-class SizedBubbleDelegateView : public BubbleDelegateView {
+class TestBubbleDelegateView : public BubbleDelegateView {
  public:
-  SizedBubbleDelegateView(View* anchor_view);
-  virtual ~SizedBubbleDelegateView();
+  explicit TestBubbleDelegateView(View* anchor_view);
+  virtual ~TestBubbleDelegateView();
 
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
+  // BubbleDelegateView overrides:
+  virtual bool CanResize() const OVERRIDE;
+  virtual DialogDelegate* AsDialogDelegate() OVERRIDE;
+
+  void set_can_resize(bool can_resize) { can_resize_ = can_resize; }
+
  private:
-  DISALLOW_COPY_AND_ASSIGN(SizedBubbleDelegateView);
+  bool can_resize_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestBubbleDelegateView);
 };
 
-SizedBubbleDelegateView::SizedBubbleDelegateView(View* anchor_view)
-    : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT) {
+TestBubbleDelegateView::TestBubbleDelegateView(View* anchor_view)
+    : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
+      can_resize_(false) {
 }
 
-SizedBubbleDelegateView::~SizedBubbleDelegateView() {}
+TestBubbleDelegateView::~TestBubbleDelegateView() {}
 
-gfx::Size SizedBubbleDelegateView::GetPreferredSize() {
+gfx::Size TestBubbleDelegateView::GetPreferredSize() {
   return gfx::Size(kBubbleWidth, kBubbleHeight);
 }
 
+bool TestBubbleDelegateView::CanResize() const {
+  return can_resize_;
+}
+
+DialogDelegate* TestBubbleDelegateView::AsDialogDelegate() {
+  // This hack lets the bubble frame view be tested as its used with dialogs.
+  // In particular, this is checked while hit-testing for the ability to drag.
+  // The value should never be dereferenced in any of the tests below.
+  return reinterpret_cast<DialogDelegate*>(1);
+}
+
 class TestBubbleFrameView : public BubbleFrameView {
  public:
   TestBubbleFrameView();
   virtual ~TestBubbleFrameView();
 
  protected:
   virtual gfx::Rect GetMonitorBounds(const gfx::Rect& rect) OVERRIDE;
 
  private:
   gfx::Rect monitor_bounds_;
@@ skipping 21 matching lines @@
   EXPECT_EQ(kColor, frame.bubble_border()->background_color());
 
   int margin_x = frame.content_margins().left();
   int margin_y = frame.content_margins().top();
   gfx::Insets insets = frame.bubble_border()->GetInsets();
   EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
   EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
 }
 
 TEST_F(BubbleFrameViewTest, NonClientHitTest) {
-  // Create the anchor and parent widgets.
+  // Create the anchor view, its parent widget is needed on Aura.
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   scoped_ptr<Widget> anchor_widget(new Widget);
   anchor_widget->Init(params);
   anchor_widget->Show();
 
-  BubbleDelegateView* delegate =
-      new SizedBubbleDelegateView(anchor_widget->GetContentsView());
-  Widget* widget(BubbleDelegateView::CreateBubble(delegate));
-  widget->Show();
-  gfx::Point kPtInBound(100, 100);
-  gfx::Point kPtOutsideBound(1000, 1000);
-  BubbleFrameView* bubble_frame_view = delegate->GetBubbleFrameView();
-  EXPECT_EQ(HTCLIENT, bubble_frame_view->NonClientHitTest(kPtInBound));
-  EXPECT_EQ(HTNOWHERE, bubble_frame_view->NonClientHitTest(kPtOutsideBound));
-  widget->CloseNow();
-  RunPendingMessages();
+  TestBubbleDelegateView bubble(anchor_widget->GetContentsView());
+  BubbleDelegateView::CreateBubble(&bubble);
+  BubbleFrameView* frame = bubble.GetBubbleFrameView();
+  const int border = frame->bubble_border()->GetBorderThickness();
+
+  struct {
+    const int point;
+    const int cannot_resize_hit;
+    const int can_resize_hit;
+  } cases[] = {
+    { border,      HTCAPTION, HTTOPLEFT },
+    { border + 3,  HTCAPTION, HTTOPLEFT },
+    { border + 4,  HTCAPTION, HTCAPTION },
+    { border + 8,  HTCAPTION, HTCAPTION },
+    { border + 50, HTCLIENT,  HTCLIENT  },
+    { 1000,        HTNOWHERE, HTNOWHERE },
+  };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
+    gfx::Point point(cases[i].point, cases[i].point);
+    bubble.set_can_resize(false);
+    EXPECT_EQ(cases[i].cannot_resize_hit, frame->NonClientHitTest(point));
+    bubble.set_can_resize(true);
+    EXPECT_EQ(cases[i].can_resize_hit, frame->NonClientHitTest(point));
+  }
 }
 
 // Tests that the arrow is mirrored as needed to better fit the screen.
 TEST_F(BubbleFrameViewTest, GetUpdatedWindowBounds) {
   TestBubbleFrameView frame;
   gfx::Rect window_bounds;
 
   gfx::Insets insets = frame.bubble_border()->GetInsets();
   int xposition = 95 - insets.width();
 
@@ skipping 279 matching lines @@
       gfx::Rect(900, 900, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
       true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::RIGHT_CENTER, frame.bubble_border()->arrow());
   EXPECT_EQ(window_bounds.bottom(), 1000);
   EXPECT_EQ(window_bounds.y() +
             frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
 }
 
 }  // namespace views