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

Side by Side Diff: ash/system/rotation/tray_rotation_lock_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 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 "ash/system/rotation/tray_rotation_lock.h" 5 #include "ash/system/rotation/tray_rotation_lock.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/display/screen_orientation_controller_chromeos.h" 9 #include "ash/display/screen_orientation_controller_chromeos.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/status_area_widget.h" 12 #include "ash/system/status_area_widget.h"
13 #include "ash/system/tray/system_tray.h" 13 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/system_tray_delegate.h" 14 #include "ash/system/tray/system_tray_delegate.h"
15 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
16 #include "ash/test/status_area_widget_test_helper.h" 16 #include "ash/test/status_area_widget_test_helper.h"
17 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 17 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
18 #include "ash/wm_shell.h"
19 #include "base/command_line.h" 18 #include "base/command_line.h"
20 #include "base/time/time.h" 19 #include "base/time/time.h"
21 #include "ui/display/display_switches.h" 20 #include "ui/display/display_switches.h"
22 #include "ui/display/manager/display_manager.h" 21 #include "ui/display/manager/display_manager.h"
23 #include "ui/display/types/display_constants.h" 22 #include "ui/display/types/display_constants.h"
24 #include "ui/events/event.h" 23 #include "ui/events/event.h"
25 #include "ui/events/event_constants.h" 24 #include "ui/events/event_constants.h"
26 #include "ui/views/view.h" 25 #include "ui/views/view.h"
27 26
28 namespace ash { 27 namespace ash {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 TEST_F(TrayRotationLockTest, LockUpdatedDuringDesctruction) { 256 TEST_F(TrayRotationLockTest, LockUpdatedDuringDesctruction) {
258 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( 257 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
259 true); 258 true);
260 DestroyTrayView(); 259 DestroyTrayView();
261 Shell::Get()->screen_orientation_controller()->ToggleUserRotationLock(); 260 Shell::Get()->screen_orientation_controller()->ToggleUserRotationLock();
262 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager( 261 Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
263 false); 262 false);
264 } 263 }
265 264
266 } // namespace ash 265 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698