Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Unified Diff: views/bubble/bubble_frame_view_unittest.cc

Issue 8368006: Support Windows native textfield, combobox, etc. in new bubbles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore Widget return; same as Patch Set 9 with updated CreateBubble comment. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/bubble/bubble_delegate_unittest.cc ('k') | views/bubble/bubble_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/bubble/bubble_frame_view_unittest.cc
diff --git a/views/bubble/bubble_frame_view_unittest.cc b/views/bubble/bubble_frame_view_unittest.cc
index 766bcec709d3a6f27644f102f4b35cb5e9a0f6f1..bbdd203c8ae2ddd95feb00a09c11a49312a2d6fe 100644
--- a/views/bubble/bubble_frame_view_unittest.cc
+++ b/views/bubble/bubble_frame_view_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/bubble/bubble_frame_view.h"
#include "views/bubble/bubble_delegate.h"
+#include "views/bubble/bubble_frame_view.h"
#include "views/test/views_test_base.h"
#include "views/widget/widget.h"
#if !defined(OS_WIN)
@@ -32,22 +32,34 @@ TEST_F(BubbleFrameViewBasicTest, GetBoundsForClientView) {
EXPECT_EQ(expected_insets.top(), frame.GetBoundsForClientView().y());
}
+} // namespace
+
+class SizedBubbleDelegateView : public BubbleDelegateView {
+ public:
+ SizedBubbleDelegateView() {}
+ virtual ~SizedBubbleDelegateView() {}
+
+ // View overrides:
+ virtual gfx::Size GetPreferredSize() OVERRIDE;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(SizedBubbleDelegateView);
+};
+
+gfx::Size SizedBubbleDelegateView::GetPreferredSize() { return kRect.size(); }
+
TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
- BubbleDelegateView* delegate = new BubbleDelegateView();
- scoped_ptr<Widget> widget(
- views::BubbleDelegateView::CreateBubble(delegate, NULL));
- widget->SetBounds(kRect);
- widget->Show();
+ SizedBubbleDelegateView* delegate = new SizedBubbleDelegateView();
+ scoped_ptr<Widget> widget(BubbleDelegateView::CreateBubble(delegate, NULL));
+ delegate->Show();
gfx::Point kPtInBound(100, 100);
gfx::Point kPtOutsideBound(1000, 1000);
- EXPECT_EQ(HTCLIENT, widget->non_client_view()->NonClientHitTest(kPtInBound));
- EXPECT_EQ(HTNOWHERE,
- widget->non_client_view()->NonClientHitTest(kPtOutsideBound));
+ BubbleFrameView* bubble_frame_view = delegate->GetBubbleFrameView();
+ EXPECT_EQ(HTCLIENT, bubble_frame_view->NonClientHitTest(kPtInBound));
+ EXPECT_EQ(HTNOWHERE, bubble_frame_view->NonClientHitTest(kPtOutsideBound));
widget->CloseNow();
widget.reset();
RunPendingMessages();
}
-} // namespace
-
} // namespace views
« no previous file with comments | « views/bubble/bubble_delegate_unittest.cc ('k') | views/bubble/bubble_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698