Fix Views new dialog style hit-testing.

ui/views/window/dialog_delegate_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/views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/test/views_test_base.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
+
+namespace views {
+
+typedef ViewsTestBase DialogTest;
+
+namespace {
+
+class TestDialog : public DialogDelegateView {
+ public:
+  TestDialog() : can_resize_(false) {}
+  virtual ~TestDialog() {}
+
+  // BubbleDelegateView overrides:
+  virtual gfx::Size GetPreferredSize() OVERRIDE { return gfx::Size(200, 200); }
+  virtual bool CanResize() const OVERRIDE { return can_resize_; }
+
+  void set_can_resize(bool can_resize) { can_resize_ = can_resize; }
+
+ private:
+  bool can_resize_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestDialog);
+};
+
+}  // namespace
+
+TEST_F(DialogTest, HitTest) {
+  TestDialog* dialog = new TestDialog();
+  DialogDelegate::CreateDialogWidget(dialog, NULL, GetContext());
+  const NonClientView* view = dialog->GetWidget()->non_client_view();
+
+  if (DialogDelegate::UseNewStyle()) {
+    // Ensure that the new style's BubbleFrameView hit-tests as expected.
+    BubbleFrameView* frame = static_cast<BubbleFrameView*>(view->frame_view());
+    const int border = frame->bubble_border()->GetBorderThickness();
+
+    struct {
+      const int point;
+      const int cannot_resize_hit;
+      const int can_resize_hit;
+    } cases[] = {
+      { border,      HTSYSMENU, HTTOPLEFT },
+      { border + 3,  HTSYSMENU, HTTOPLEFT },
+      { border + 4,  HTSYSMENU, HTSYSMENU },
+      { border + 11, HTSYSMENU, HTSYSMENU },
+      { border + 12, HTCAPTION, HTCAPTION },
+      { border + 30, HTCAPTION, HTCAPTION },
+      { border + 40, HTCLIENT,  HTCLIENT  },
+      { 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);
+      dialog->set_can_resize(false);
+      EXPECT_EQ(cases[i].cannot_resize_hit, frame->NonClientHitTest(point))
+          << " with border: " << border << ", at point " << cases[i].point;
+      dialog->set_can_resize(true);
+      EXPECT_EQ(cases[i].can_resize_hit, frame->NonClientHitTest(point))
+          << " with border: " << border << ", at point " << cases[i].point;
+    }
+  }
+}
+
+}  // namespace views