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

Side by Side Diff: ui/views/bubble/bubble_delegate_unittest.cc

Issue 454173002: Fixed BubbleBorder sizing problems & added unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Combined test fixtures and rewrote tests to be more easily maintained. Created 6 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/hit_test.h" 5 #include "ui/base/hit_test.h"
6 #include "ui/views/bubble/bubble_delegate.h" 6 #include "ui/views/bubble/bubble_delegate.h"
7 #include "ui/views/bubble/bubble_frame_view.h" 7 #include "ui/views/bubble/bubble_frame_view.h"
8 #include "ui/views/test/test_widget_observer.h" 8 #include "ui/views/test/test_widget_observer.h"
9 #include "ui/views/test/views_test_base.h" 9 #include "ui/views/test/views_test_base.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 bubble_widget->GetFocusManager()->GetFocusedView()); 211 bubble_widget->GetFocusManager()->GetFocusedView());
212 bubble_widget->CloseNow(); 212 bubble_widget->CloseNow();
213 } 213 }
214 214
215 TEST_F(BubbleDelegateTest, NonClientHitTest) { 215 TEST_F(BubbleDelegateTest, NonClientHitTest) {
216 scoped_ptr<Widget> anchor_widget(CreateTestWidget()); 216 scoped_ptr<Widget> anchor_widget(CreateTestWidget());
217 TestBubbleDelegateView* bubble_delegate = 217 TestBubbleDelegateView* bubble_delegate =
218 new TestBubbleDelegateView(anchor_widget->GetContentsView()); 218 new TestBubbleDelegateView(anchor_widget->GetContentsView());
219 BubbleDelegateView::CreateBubble(bubble_delegate); 219 BubbleDelegateView::CreateBubble(bubble_delegate);
220 BubbleFrameView* frame = bubble_delegate->GetBubbleFrameView(); 220 BubbleFrameView* frame = bubble_delegate->GetBubbleFrameView();
221 const int border = frame->bubble_border()->GetBorderThickness(); 221 const int border = frame->bubble_border()->GetBorderExteriorThickness();
222 222
223 struct { 223 struct {
224 const int point; 224 const int point;
225 const int hit; 225 const int hit;
226 } cases[] = { 226 } cases[] = {
227 { border, HTNOWHERE }, 227 { border, HTNOWHERE },
228 { border + 50, HTCLIENT }, 228 { border + 50, HTCLIENT },
229 { 1000, HTNOWHERE }, 229 { 1000, HTNOWHERE },
230 }; 230 };
231 231
(...skipping 24 matching lines...) Expand all
256 scoped_ptr<Widget> anchor_widget(CreateTestWidget()); 256 scoped_ptr<Widget> anchor_widget(CreateTestWidget());
257 BubbleDelegateView* bubble_delegate = new BubbleDelegateView( 257 BubbleDelegateView* bubble_delegate = new BubbleDelegateView(
258 anchor_widget->GetContentsView(), BubbleBorder::NONE); 258 anchor_widget->GetContentsView(), BubbleBorder::NONE);
259 bubble_delegate->set_can_activate(false); 259 bubble_delegate->set_can_activate(false);
260 Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate); 260 Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate);
261 bubble_widget->Show(); 261 bubble_widget->Show();
262 EXPECT_FALSE(bubble_widget->CanActivate()); 262 EXPECT_FALSE(bubble_widget->CanActivate());
263 } 263 }
264 264
265 } // namespace views 265 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698