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

Side by Side Diff: ash/shelf/shelf_tooltip_manager_unittest.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shelf/shelf_tooltip_manager.h" 5 #include "ash/shelf/shelf_tooltip_manager.h"
6 6
7 #include "ash/shelf/app_list_button.h" 7 #include "ash/shelf/app_list_button.h"
8 #include "ash/shelf/shelf_model.h" 8 #include "ash/shelf/shelf_model.h"
9 #include "ash/shelf/shelf_view.h" 9 #include "ash/shelf/shelf_view.h"
10 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell_port.h"
11 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
12 #include "ash/test/shelf_view_test_api.h" 13 #include "ash/test/shelf_view_test_api.h"
13 #include "ash/test/test_shelf_item_delegate.h" 14 #include "ash/test/test_shelf_item_delegate.h"
14 #include "ash/wm_shell.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "ui/events/event_constants.h" 16 #include "ui/events/event_constants.h"
17 #include "ui/events/test/event_generator.h" 17 #include "ui/events/test/event_generator.h"
18 #include "ui/views/bubble/bubble_dialog_delegate.h" 18 #include "ui/views/bubble/bubble_dialog_delegate.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace test { 22 namespace test {
23 23
24 class ShelfTooltipManagerTest : public AshTestBase { 24 class ShelfTooltipManagerTest : public AshTestBase {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton()); 160 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
161 EXPECT_TRUE(tooltip_manager_->IsVisible()); 161 EXPECT_TRUE(tooltip_manager_->IsVisible());
162 162
163 // ShowTooltipWithDelay should run the timer for an auto-hide-shown shelf. 163 // ShowTooltipWithDelay should run the timer for an auto-hide-shown shelf.
164 tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton()); 164 tooltip_manager_->ShowTooltipWithDelay(shelf_view_->GetAppListButton());
165 EXPECT_TRUE(IsTimerRunning()); 165 EXPECT_TRUE(IsTimerRunning());
166 } 166 }
167 167
168 TEST_F(ShelfTooltipManagerTest, HideForEvents) { 168 TEST_F(ShelfTooltipManagerTest, HideForEvents) {
169 // TODO: investigate failure in mash. http://crbug.com/695563. 169 // TODO: investigate failure in mash. http://crbug.com/695563.
170 if (WmShell::Get()->IsRunningInMash()) 170 if (ShellPort::Get()->IsRunningInMash())
171 return; 171 return;
172 172
173 ui::test::EventGenerator& generator = GetEventGenerator(); 173 ui::test::EventGenerator& generator = GetEventGenerator();
174 gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen(); 174 gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
175 175
176 // Should hide if the mouse exits the shelf area. 176 // Should hide if the mouse exits the shelf area.
177 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton()); 177 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
178 ASSERT_TRUE(tooltip_manager_->IsVisible()); 178 ASSERT_TRUE(tooltip_manager_->IsVisible());
179 generator.MoveMouseTo(shelf_bounds.CenterPoint()); 179 generator.MoveMouseTo(shelf_bounds.CenterPoint());
180 generator.SendMouseExit(); 180 generator.SendMouseExit();
(...skipping 15 matching lines...) Expand all
196 196
197 // Should hide for gesture events in the shelf. 197 // Should hide for gesture events in the shelf.
198 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton()); 198 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
199 ASSERT_TRUE(tooltip_manager_->IsVisible()); 199 ASSERT_TRUE(tooltip_manager_->IsVisible());
200 generator.GestureTapDownAndUp(shelf_bounds.CenterPoint()); 200 generator.GestureTapDownAndUp(shelf_bounds.CenterPoint());
201 EXPECT_FALSE(tooltip_manager_->IsVisible()); 201 EXPECT_FALSE(tooltip_manager_->IsVisible());
202 } 202 }
203 203
204 TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) { 204 TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
205 // TODO: investigate failure in mash. http://crbug.com/695563. 205 // TODO: investigate failure in mash. http://crbug.com/695563.
206 if (WmShell::Get()->IsRunningInMash()) 206 if (ShellPort::Get()->IsRunningInMash())
207 return; 207 return;
208 208
209 ui::test::EventGenerator& generator = GetEventGenerator(); 209 ui::test::EventGenerator& generator = GetEventGenerator();
210 210
211 // Should hide for touches outside the shelf. 211 // Should hide for touches outside the shelf.
212 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton()); 212 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
213 ASSERT_TRUE(tooltip_manager_->IsVisible()); 213 ASSERT_TRUE(tooltip_manager_->IsVisible());
214 generator.set_current_location(gfx::Point()); 214 generator.set_current_location(gfx::Point());
215 generator.PressTouch(); 215 generator.PressTouch();
216 EXPECT_FALSE(tooltip_manager_->IsVisible()); 216 EXPECT_FALSE(tooltip_manager_->IsVisible());
(...skipping 20 matching lines...) Expand all
237 237
238 // Should not hide for key events. 238 // Should not hide for key events.
239 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton()); 239 tooltip_manager_->ShowTooltip(shelf_view_->GetAppListButton());
240 ASSERT_TRUE(tooltip_manager_->IsVisible()); 240 ASSERT_TRUE(tooltip_manager_->IsVisible());
241 generator.PressKey(ui::VKEY_A, ui::EF_NONE); 241 generator.PressKey(ui::VKEY_A, ui::EF_NONE);
242 EXPECT_TRUE(tooltip_manager_->IsVisible()); 242 EXPECT_TRUE(tooltip_manager_->IsVisible());
243 } 243 }
244 244
245 } // namespace test 245 } // namespace test
246 } // namespace ash 246 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698