| 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/aura/wm_shell_aura.h" | 7 #include "ash/aura/wm_shell_aura.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
| 9 #include "ash/common/shell_delegate.h" | 9 #include "ash/common/shell_delegate.h" |
| 10 #include "ash/display/display_configuration_controller.h" | 10 #include "ash/display/display_configuration_controller.h" |
| 11 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
| 12 #include "ash/shelf/shelf_delegate.h" | |
| 13 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 14 | 13 |
| 15 namespace ash { | 14 namespace ash { |
| 16 namespace test { | 15 namespace test { |
| 17 | 16 |
| 18 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} | 17 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} |
| 19 | 18 |
| 20 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { | 19 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { |
| 21 return shell_->system_gesture_filter_.get(); | 20 return shell_->system_gesture_filter_.get(); |
| 22 } | 21 } |
| (...skipping 20 matching lines...) Expand all Loading... |
| 43 } | 42 } |
| 44 | 43 |
| 45 app_list::AppListPresenter* ShellTestApi::app_list_presenter() { | 44 app_list::AppListPresenter* ShellTestApi::app_list_presenter() { |
| 46 return shell_->wm_shell_->delegate()->GetAppListPresenter(); | 45 return shell_->wm_shell_->delegate()->GetAppListPresenter(); |
| 47 } | 46 } |
| 48 | 47 |
| 49 void ShellTestApi::DisableDisplayAnimator() { | 48 void ShellTestApi::DisableDisplayAnimator() { |
| 50 shell_->display_configuration_controller()->ResetAnimatorForTest(); | 49 shell_->display_configuration_controller()->ResetAnimatorForTest(); |
| 51 } | 50 } |
| 52 | 51 |
| 53 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { | |
| 54 shell_->shelf_delegate_.reset(delegate); | |
| 55 } | |
| 56 | |
| 57 void ShellTestApi::SetSessionStateDelegate( | 52 void ShellTestApi::SetSessionStateDelegate( |
| 58 SessionStateDelegate* session_state_delegate) { | 53 SessionStateDelegate* session_state_delegate) { |
| 59 shell_->session_state_delegate_.reset(session_state_delegate); | 54 shell_->session_state_delegate_.reset(session_state_delegate); |
| 60 } | 55 } |
| 61 | 56 |
| 62 } // namespace test | 57 } // namespace test |
| 63 } // namespace ash | 58 } // namespace ash |
| OLD | NEW |