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 30 matching lines...) Expand all Loading... |
41 } | 41 } |
42 | 42 |
43 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { | 43 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { |
44 return shell_->native_cursor_manager_; | 44 return shell_->native_cursor_manager_; |
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() { |
| 52 return shell_->drag_drop_controller_.get(); |
| 53 } |
| 54 |
51 void ShellTestApi::DisableOutputConfiguratorAnimation() { | 55 void ShellTestApi::DisableOutputConfiguratorAnimation() { |
52 #if defined(OS_CHROMEOS) | 56 #if defined(OS_CHROMEOS) |
53 if (shell_->output_configurator_animation_) { | 57 if (shell_->output_configurator_animation_) { |
54 shell_->output_configurator_->RemoveObserver( | 58 shell_->output_configurator_->RemoveObserver( |
55 shell_->output_configurator_animation_.get()); | 59 shell_->output_configurator_animation_.get()); |
56 shell_->output_configurator_animation_.reset(); | 60 shell_->output_configurator_animation_.reset(); |
57 } | 61 } |
58 #endif // defined(OS_CHROMEOS) | 62 #endif // defined(OS_CHROMEOS) |
59 } | 63 } |
60 | 64 |
61 } // namespace test | 65 } // namespace test |
62 } // namespace ash | 66 } // namespace ash |
OLD | NEW |