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

Side by Side Diff: ash/test/ash_test_base.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log
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/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/display/display_controller.h" 11 #include "ash/display/display_controller.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/shell/toplevel_window.h" 13 #include "ash/shell/toplevel_window.h"
14 #include "ash/test/ash_test_helper.h" 14 #include "ash/test/ash_test_helper.h"
15 #include "ash/test/display_manager_test_api.h" 15 #include "ash/test/display_manager_test_api.h"
16 #include "ash/test/test_session_state_delegate.h" 16 #include "ash/test/test_session_state_delegate.h"
17 #include "ash/test/test_shell_delegate.h" 17 #include "ash/test/test_shell_delegate.h"
18 #include "ash/test/test_system_tray_delegate.h" 18 #include "ash/test/test_system_tray_delegate.h"
19 #include "ash/wm/coordinate_conversion.h" 19 #include "ash/wm/coordinate_conversion.h"
20 #include "ash/wm/window_positioner.h" 20 #include "ash/wm/window_positioner.h"
21 #include "base/command_line.h" 21 #include "base/command_line.h"
22 #include "content/public/test/web_contents_tester.h" 22 #include "content/public/test/web_contents_tester.h"
23 #include "ui/aura/client/aura_constants.h" 23 #include "ui/aura/client/aura_constants.h"
24 #include "ui/aura/client/screen_position_client.h" 24 #include "ui/aura/client/screen_position_client.h"
25 #include "ui/aura/client/window_tree_client.h" 25 #include "ui/aura/client/window_tree_client.h"
26 #include "ui/aura/root_window.h"
27 #include "ui/aura/test/event_generator.h" 26 #include "ui/aura/test/event_generator.h"
28 #include "ui/aura/test/test_window_delegate.h" 27 #include "ui/aura/test/test_window_delegate.h"
29 #include "ui/aura/window.h" 28 #include "ui/aura/window.h"
30 #include "ui/aura/window_delegate.h" 29 #include "ui/aura/window_delegate.h"
30 #include "ui/aura/window_event_dispatcher.h"
31 #include "ui/base/ime/input_method_initializer.h" 31 #include "ui/base/ime/input_method_initializer.h"
32 #include "ui/events/gestures/gesture_configuration.h" 32 #include "ui/events/gestures/gesture_configuration.h"
33 #include "ui/gfx/display.h" 33 #include "ui/gfx/display.h"
34 #include "ui/gfx/point.h" 34 #include "ui/gfx/point.h"
35 #include "ui/gfx/screen.h" 35 #include "ui/gfx/screen.h"
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "ash/system/chromeos/tray_display.h" 38 #include "ash/system/chromeos/tray_display.h"
39 #endif 39 #endif
40 40
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 340
341 void AshTestBase::UnblockUserSession() { 341 void AshTestBase::UnblockUserSession() {
342 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); 342 Shell::GetInstance()->session_state_delegate()->UnlockScreen();
343 SetSessionStarted(true); 343 SetSessionStarted(true);
344 SetUserAddingScreenRunning(false); 344 SetUserAddingScreenRunning(false);
345 } 345 }
346 346
347 347
348 } // namespace test 348 } // namespace test
349 } // namespace ash 349 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698