| OLD | NEW |
| 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/shell_test_api.h" | 5 #include "ash/test/shell_test_api.h" |
| 6 | 6 |
| 7 #include "ash/common/session/session_state_delegate.h" | |
| 8 #include "ash/display/display_configuration_controller.h" | 7 #include "ash/display/display_configuration_controller.h" |
| 9 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/session/session_state_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 namespace test { | 13 namespace test { |
| 14 | 14 |
| 15 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} | 15 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} |
| 16 | 16 |
| 17 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { | 17 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { |
| 18 return shell_->system_gesture_filter_.get(); | 18 return shell_->system_gesture_filter_.get(); |
| 19 } | 19 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 38 shell_->display_configuration_controller()->ResetAnimatorForTest(); | 38 shell_->display_configuration_controller()->ResetAnimatorForTest(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void ShellTestApi::SetSessionStateDelegate( | 41 void ShellTestApi::SetSessionStateDelegate( |
| 42 SessionStateDelegate* session_state_delegate) { | 42 SessionStateDelegate* session_state_delegate) { |
| 43 shell_->session_state_delegate_.reset(session_state_delegate); | 43 shell_->session_state_delegate_.reset(session_state_delegate); |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace test | 46 } // namespace test |
| 47 } // namespace ash | 47 } // namespace ash |
| OLD | NEW |