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

Side by Side Diff: ash/system/toast/toast_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/system/toast/toast_manager.h"
5 #include "ash/shelf/shelf_constants.h" 6 #include "ash/shelf/shelf_constants.h"
6 #include "ash/shelf/wm_shelf.h" 7 #include "ash/shelf/wm_shelf.h"
7 #include "ash/shell.h" 8 #include "ash/shell.h"
8 #include "ash/system/toast/toast_manager.h" 9 #include "ash/shell_port.h"
9 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
10 #include "ash/wm/wm_screen_util.h" 11 #include "ash/wm/wm_screen_util.h"
11 #include "ash/wm_shell.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 16 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
17 #include "ui/display/manager/display_manager.h" 17 #include "ui/display/manager/display_manager.h"
18 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
19 19
20 namespace ash { 20 namespace ash {
21 21
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 EXPECT_FALSE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating()); 123 EXPECT_FALSE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating());
124 124
125 ClickDismissButton(); 125 ClickDismissButton();
126 126
127 EXPECT_EQ(nullptr, GetCurrentOverlay()); 127 EXPECT_EQ(nullptr, GetCurrentOverlay());
128 } 128 }
129 129
130 TEST_F(ToastManagerTest, ShowAndCloseManuallyDuringAnimation) { 130 TEST_F(ToastManagerTest, ShowAndCloseManuallyDuringAnimation) {
131 // TODO: gets wedged running animator. http://crbug.com/698016. 131 // TODO: gets wedged running animator. http://crbug.com/698016.
132 if (WmShell::Get()->IsRunningInMash()) 132 if (ShellPort::Get()->IsRunningInMash())
133 return; 133 return;
134 134
135 ui::ScopedAnimationDurationScaleMode slow_animation_duration( 135 ui::ScopedAnimationDurationScaleMode slow_animation_duration(
136 ui::ScopedAnimationDurationScaleMode::SLOW_DURATION); 136 ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
137 137
138 ShowToast("DUMMY", ToastData::kInfiniteDuration); 138 ShowToast("DUMMY", ToastData::kInfiniteDuration);
139 EXPECT_TRUE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating()); 139 EXPECT_TRUE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating());
140 base::RunLoop().RunUntilIdle(); 140 base::RunLoop().RunUntilIdle();
141 141
142 EXPECT_EQ(1, GetToastSerial()); 142 EXPECT_EQ(1, GetToastSerial());
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 gfx::Rect shelf_bounds = shelf->GetIdealBounds(); 254 gfx::Rect shelf_bounds = shelf->GetIdealBounds();
255 EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds)); 255 EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
256 EXPECT_NEAR( 256 EXPECT_NEAR(
257 shelf_bounds.right() + (root_bounds.width() - shelf_bounds.width()) / 2.0, 257 shelf_bounds.right() + (root_bounds.width() - shelf_bounds.width()) / 2.0,
258 precise_toast_bounds.CenterPoint().x(), 1.f /* accepted error */); 258 precise_toast_bounds.CenterPoint().x(), 1.f /* accepted error */);
259 } 259 }
260 260
261 TEST_F(ToastManagerTest, PositionWithUnifiedDesktop) { 261 TEST_F(ToastManagerTest, PositionWithUnifiedDesktop) {
262 // TODO: needs unified mode. http://crbug.com/698024. 262 // TODO: needs unified mode. http://crbug.com/698024.
263 if (WmShell::Get()->IsRunningInMash()) 263 if (ShellPort::Get()->IsRunningInMash())
264 return; 264 return;
265 265
266 display_manager()->SetUnifiedDesktopEnabled(true); 266 display_manager()->SetUnifiedDesktopEnabled(true);
267 UpdateDisplay("1000x500,0+600-100x500"); 267 UpdateDisplay("1000x500,0+600-100x500");
268 268
269 WmShelf* shelf = GetPrimaryShelf(); 269 WmShelf* shelf = GetPrimaryShelf();
270 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment()); 270 EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
271 EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState()); 271 EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
272 272
273 ShowToast("DUMMY", ToastData::kInfiniteDuration); 273 ShowToast("DUMMY", ToastData::kInfiniteDuration);
(...skipping 30 matching lines...) Expand all
304 EXPECT_EQ(base::ASCIIToUTF16("TEXT3"), GetCurrentText()); 304 EXPECT_EQ(base::ASCIIToUTF16("TEXT3"), GetCurrentText());
305 // Cancel the shown toast. 305 // Cancel the shown toast.
306 CancelToast(id3); 306 CancelToast(id3);
307 // Confirm that the shown toast disappears. 307 // Confirm that the shown toast disappears.
308 EXPECT_FALSE(GetCurrentOverlay()); 308 EXPECT_FALSE(GetCurrentOverlay());
309 // Confirm that only 1 toast is shown. 309 // Confirm that only 1 toast is shown.
310 EXPECT_EQ(2, GetToastSerial()); 310 EXPECT_EQ(2, GetToastSerial());
311 } 311 }
312 312
313 } // namespace ash 313 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698