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

Side by Side Diff: ash/tooltips/tooltip_controller_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/test/ash_test_base.h" 6 #include "ash/test/ash_test_base.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/aura/window_event_dispatcher.h" 10 #include "ui/aura/window_event_dispatcher.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 public: 75 public:
76 TooltipControllerTest() {} 76 TooltipControllerTest() {}
77 ~TooltipControllerTest() override {} 77 ~TooltipControllerTest() override {}
78 78
79 void SetUp() override { 79 void SetUp() override {
80 AshTestBase::SetUp(); 80 AshTestBase::SetUp();
81 helper_.reset(new TooltipControllerTestHelper(GetController())); 81 helper_.reset(new TooltipControllerTestHelper(GetController()));
82 } 82 }
83 83
84 protected: 84 protected:
85 scoped_ptr<TooltipControllerTestHelper> helper_; 85 std::unique_ptr<TooltipControllerTestHelper> helper_;
86 86
87 private: 87 private:
88 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest); 88 DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
89 }; 89 };
90 90
91 TEST_F(TooltipControllerTest, NonNullTooltipClient) { 91 TEST_F(TooltipControllerTest, NonNullTooltipClient) {
92 EXPECT_TRUE(aura::client::GetTooltipClient(Shell::GetPrimaryRootWindow()) 92 EXPECT_TRUE(aura::client::GetTooltipClient(Shell::GetPrimaryRootWindow())
93 != NULL); 93 != NULL);
94 EXPECT_EQ(base::string16(), helper_->GetTooltipText()); 94 EXPECT_EQ(base::string16(), helper_->GetTooltipText());
95 EXPECT_EQ(NULL, helper_->GetTooltipWindow()); 95 EXPECT_EQ(NULL, helper_->GetTooltipWindow());
96 EXPECT_FALSE(helper_->IsTooltipVisible()); 96 EXPECT_FALSE(helper_->IsTooltipVisible());
97 } 97 }
98 98
99 TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) { 99 TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) {
100 scoped_ptr<views::Widget> widget(CreateNewWidgetOn(0)); 100 std::unique_ptr<views::Widget> widget(CreateNewWidgetOn(0));
101 TooltipTestView* view = new TooltipTestView; 101 TooltipTestView* view = new TooltipTestView;
102 AddViewToWidgetAndResize(widget.get(), view); 102 AddViewToWidgetAndResize(widget.get(), view);
103 view->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text")); 103 view->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text"));
104 EXPECT_EQ(base::string16(), helper_->GetTooltipText()); 104 EXPECT_EQ(base::string16(), helper_->GetTooltipText());
105 EXPECT_EQ(NULL, helper_->GetTooltipWindow()); 105 EXPECT_EQ(NULL, helper_->GetTooltipWindow());
106 106
107 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); 107 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
108 generator.MoveMouseRelativeTo(widget->GetNativeView(), 108 generator.MoveMouseRelativeTo(widget->GetNativeView(),
109 view->bounds().CenterPoint()); 109 view->bounds().CenterPoint());
110 base::string16 expected_tooltip = base::ASCIIToUTF16("Tooltip Text"); 110 base::string16 expected_tooltip = base::ASCIIToUTF16("Tooltip Text");
(...skipping 14 matching lines...) Expand all
125 helper_->FireTooltipTimer(); 125 helper_->FireTooltipTimer();
126 EXPECT_TRUE(helper_->IsTooltipVisible()); 126 EXPECT_TRUE(helper_->IsTooltipVisible());
127 } 127 }
128 128
129 TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) { 129 TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) {
130 if (!SupportsMultipleDisplays()) 130 if (!SupportsMultipleDisplays())
131 return; 131 return;
132 132
133 UpdateDisplay("1000x600,600x400"); 133 UpdateDisplay("1000x600,600x400");
134 aura::Window::Windows root_windows = Shell::GetAllRootWindows(); 134 aura::Window::Windows root_windows = Shell::GetAllRootWindows();
135 scoped_ptr<views::Widget> widget1(CreateNewWidgetWithBoundsOn( 135 std::unique_ptr<views::Widget> widget1(
136 0, gfx::Rect(10, 10, 100, 100))); 136 CreateNewWidgetWithBoundsOn(0, gfx::Rect(10, 10, 100, 100)));
137 TooltipTestView* view1 = new TooltipTestView; 137 TooltipTestView* view1 = new TooltipTestView;
138 AddViewToWidgetAndResize(widget1.get(), view1); 138 AddViewToWidgetAndResize(widget1.get(), view1);
139 view1->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 1")); 139 view1->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 1"));
140 EXPECT_EQ(widget1->GetNativeView()->GetRootWindow(), root_windows[0]); 140 EXPECT_EQ(widget1->GetNativeView()->GetRootWindow(), root_windows[0]);
141 141
142 scoped_ptr<views::Widget> widget2(CreateNewWidgetWithBoundsOn( 142 std::unique_ptr<views::Widget> widget2(
143 1, gfx::Rect(1200, 10, 100, 100))); 143 CreateNewWidgetWithBoundsOn(1, gfx::Rect(1200, 10, 100, 100)));
144 TooltipTestView* view2 = new TooltipTestView; 144 TooltipTestView* view2 = new TooltipTestView;
145 AddViewToWidgetAndResize(widget2.get(), view2); 145 AddViewToWidgetAndResize(widget2.get(), view2);
146 view2->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 2")); 146 view2->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 2"));
147 EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[1]); 147 EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[1]);
148 148
149 // Show tooltip on second display. 149 // Show tooltip on second display.
150 ui::test::EventGenerator generator(root_windows[1]); 150 ui::test::EventGenerator generator(root_windows[1]);
151 generator.MoveMouseRelativeTo(widget2->GetNativeView(), 151 generator.MoveMouseRelativeTo(widget2->GetNativeView(),
152 view2->bounds().CenterPoint()); 152 view2->bounds().CenterPoint());
153 helper_->FireTooltipTimer(); 153 helper_->FireTooltipTimer();
(...skipping 14 matching lines...) Expand all
168 // be able to show tooltips on the primary display. 168 // be able to show tooltips on the primary display.
169 ui::test::EventGenerator generator1(root_windows[0]); 169 ui::test::EventGenerator generator1(root_windows[0]);
170 generator1.MoveMouseRelativeTo(widget1->GetNativeView(), 170 generator1.MoveMouseRelativeTo(widget1->GetNativeView(),
171 view1->bounds().CenterPoint()); 171 view1->bounds().CenterPoint());
172 helper_->FireTooltipTimer(); 172 helper_->FireTooltipTimer();
173 EXPECT_TRUE(helper_->IsTooltipVisible()); 173 EXPECT_TRUE(helper_->IsTooltipVisible());
174 } 174 }
175 175
176 } // namespace test 176 } // namespace test
177 } // namespace ash 177 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698