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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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 unified diff | Download patch
« no previous file with comments | « ui/views/bubble/bubble_window_targeter.h ('k') | ui/views/bubble/tray_bubble_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/views/bubble/bubble_window_targeter.h" 5 #include "ui/views/bubble/bubble_window_targeter.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 #include "ui/aura/window_event_dispatcher.h" 8 #include "ui/aura/window_event_dispatcher.h"
9 #include "ui/views/bubble/bubble_border.h" 9 #include "ui/views/bubble/bubble_border.h"
10 #include "ui/views/bubble/bubble_delegate.h" 10 #include "ui/views/bubble/bubble_delegate.h"
11 #include "ui/views/test/views_test_base.h" 11 #include "ui/views/test/views_test_base.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace views { 14 namespace views {
15 15
16 namespace { 16 namespace {
17 17
18 class WidgetOwnsNativeBubble : public BubbleDelegateView { 18 class WidgetOwnsNativeBubble : public BubbleDelegateView {
19 public: 19 public:
20 WidgetOwnsNativeBubble(View* content, BubbleBorder::Arrow arrow) 20 WidgetOwnsNativeBubble(View* content, BubbleBorder::Arrow arrow)
21 : BubbleDelegateView(content, arrow) { 21 : BubbleDelegateView(content, arrow) {
22 } 22 }
23 23
24 virtual ~WidgetOwnsNativeBubble() {} 24 virtual ~WidgetOwnsNativeBubble() {}
25 25
26 private: 26 private:
27 // BubbleDelegateView: 27 // BubbleDelegateView:
28 virtual void OnBeforeBubbleWidgetInit(Widget::InitParams* params, 28 virtual void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
29 Widget* widget) const OVERRIDE { 29 Widget* widget) const override {
30 params->ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 30 params->ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
31 } 31 }
32 32
33 DISALLOW_COPY_AND_ASSIGN(WidgetOwnsNativeBubble); 33 DISALLOW_COPY_AND_ASSIGN(WidgetOwnsNativeBubble);
34 }; 34 };
35 35
36 } // namespace 36 } // namespace
37 37
38 class BubbleWindowTargeterTest : public ViewsTestBase { 38 class BubbleWindowTargeterTest : public ViewsTestBase {
39 public: 39 public:
40 BubbleWindowTargeterTest() 40 BubbleWindowTargeterTest()
41 : bubble_delegate_(NULL) { 41 : bubble_delegate_(NULL) {
42 } 42 }
43 virtual ~BubbleWindowTargeterTest() {} 43 virtual ~BubbleWindowTargeterTest() {}
44 44
45 virtual void SetUp() OVERRIDE { 45 virtual void SetUp() override {
46 ViewsTestBase::SetUp(); 46 ViewsTestBase::SetUp();
47 CreateAnchorWidget(); 47 CreateAnchorWidget();
48 CreateBubbleWidget(); 48 CreateBubbleWidget();
49 49
50 anchor_widget()->Show(); 50 anchor_widget()->Show();
51 bubble_widget()->Show(); 51 bubble_widget()->Show();
52 } 52 }
53 53
54 virtual void TearDown() OVERRIDE { 54 virtual void TearDown() override {
55 bubble_delegate_ = NULL; 55 bubble_delegate_ = NULL;
56 bubble_widget_.reset(); 56 bubble_widget_.reset();
57 anchor_.reset(); 57 anchor_.reset();
58 ViewsTestBase::TearDown(); 58 ViewsTestBase::TearDown();
59 } 59 }
60 60
61 Widget* anchor_widget() { return anchor_.get(); } 61 Widget* anchor_widget() { return anchor_.get(); }
62 Widget* bubble_widget() { return bubble_widget_.get(); } 62 Widget* bubble_widget() { return bubble_widget_.get(); }
63 BubbleDelegateView* bubble_delegate() { return bubble_delegate_; } 63 BubbleDelegateView* bubble_delegate() { return bubble_delegate_; }
64 64
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 new BubbleWindowTargeter(bubble_delegate()))); 107 new BubbleWindowTargeter(bubble_delegate())));
108 { 108 {
109 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20)); 109 bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
110 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(), 110 ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
111 bubble_bounds.origin(), ui::EF_NONE, ui::EF_NONE); 111 bubble_bounds.origin(), ui::EF_NONE, ui::EF_NONE);
112 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1)); 112 EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
113 } 113 }
114 } 114 }
115 115
116 } // namespace views 116 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/bubble/bubble_window_targeter.h ('k') | ui/views/bubble/tray_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698