| 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/shelf/shelf_delegate.h" | 8 #include "ash/shelf/shelf_delegate.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 | 10 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 } | 48 } |
| 49 | 49 |
| 50 DragDropController* ShellTestApi::drag_drop_controller() { | 50 DragDropController* ShellTestApi::drag_drop_controller() { |
| 51 return shell_->drag_drop_controller_.get(); | 51 return shell_->drag_drop_controller_.get(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 AppListController* ShellTestApi::app_list_controller() { | 54 AppListController* ShellTestApi::app_list_controller() { |
| 55 return shell_->app_list_controller_.get(); | 55 return shell_->app_list_controller_.get(); |
| 56 } | 56 } |
| 57 | 57 |
| 58 MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() { | |
| 59 return shell_->maximize_mode_window_manager_.get(); | |
| 60 } | |
| 61 | |
| 62 void ShellTestApi::DisableDisplayConfiguratorAnimation() { | 58 void ShellTestApi::DisableDisplayConfiguratorAnimation() { |
| 63 #if defined(OS_CHROMEOS) | 59 #if defined(OS_CHROMEOS) |
| 64 if (shell_->display_configurator_animation_) { | 60 if (shell_->display_configurator_animation_) { |
| 65 shell_->display_configurator_->RemoveObserver( | 61 shell_->display_configurator_->RemoveObserver( |
| 66 shell_->display_configurator_animation_.get()); | 62 shell_->display_configurator_animation_.get()); |
| 67 shell_->display_configurator_animation_.reset(); | 63 shell_->display_configurator_animation_.reset(); |
| 68 } | 64 } |
| 69 #endif // defined(OS_CHROMEOS) | 65 #endif // defined(OS_CHROMEOS) |
| 70 } | 66 } |
| 71 | 67 |
| 72 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { | 68 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { |
| 73 shell_->shelf_delegate_.reset(delegate); | 69 shell_->shelf_delegate_.reset(delegate); |
| 74 } | 70 } |
| 75 | 71 |
| 76 } // namespace test | 72 } // namespace test |
| 77 } // namespace ash | 73 } // namespace ash |
| OLD | NEW |