| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 | 9 |
| 10 #if defined(OS_CHROMEOS) | 10 #if defined(OS_CHROMEOS) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 } | 45 } |
| 46 | 46 |
| 47 LauncherModel* ShellTestApi::launcher_model() { | 47 LauncherModel* ShellTestApi::launcher_model() { |
| 48 return shell_->launcher_model_.get(); | 48 return shell_->launcher_model_.get(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 internal::DragDropController* ShellTestApi::drag_drop_controller() { | 51 internal::DragDropController* ShellTestApi::drag_drop_controller() { |
| 52 return shell_->drag_drop_controller_.get(); | 52 return shell_->drag_drop_controller_.get(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 internal::AppListController* ShellTestApi::app_list_controller() { |
| 56 return shell_->app_list_controller_.get(); |
| 57 } |
| 58 |
| 55 void ShellTestApi::DisableOutputConfiguratorAnimation() { | 59 void ShellTestApi::DisableOutputConfiguratorAnimation() { |
| 56 #if defined(OS_CHROMEOS) | 60 #if defined(OS_CHROMEOS) |
| 57 if (shell_->output_configurator_animation_) { | 61 if (shell_->output_configurator_animation_) { |
| 58 shell_->output_configurator_->RemoveObserver( | 62 shell_->output_configurator_->RemoveObserver( |
| 59 shell_->output_configurator_animation_.get()); | 63 shell_->output_configurator_animation_.get()); |
| 60 shell_->output_configurator_animation_.reset(); | 64 shell_->output_configurator_animation_.reset(); |
| 61 } | 65 } |
| 62 #endif // defined(OS_CHROMEOS) | 66 #endif // defined(OS_CHROMEOS) |
| 63 } | 67 } |
| 64 | 68 |
| 65 } // namespace test | 69 } // namespace test |
| 66 } // namespace ash | 70 } // namespace ash |
| OLD | NEW |