Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1580)

Side by Side Diff: ash/test/shell_test_api.cc

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_launcher_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/launcher/launcher_delegate.h" 7 #include "ash/launcher/launcher_delegate.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 10
(...skipping 27 matching lines...) Expand all
38 38
39 internal::ScreenPositionController* 39 internal::ScreenPositionController*
40 ShellTestApi::screen_position_controller() { 40 ShellTestApi::screen_position_controller() {
41 return shell_->screen_position_controller_.get(); 41 return shell_->screen_position_controller_.get();
42 } 42 }
43 43
44 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { 44 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
45 return shell_->native_cursor_manager_; 45 return shell_->native_cursor_manager_;
46 } 46 }
47 47
48 LauncherModel* ShellTestApi::launcher_model() { 48 ShelfModel* ShellTestApi::shelf_model() {
49 return shell_->launcher_model_.get(); 49 return shell_->shelf_model_.get();
50 } 50 }
51 51
52 internal::DragDropController* ShellTestApi::drag_drop_controller() { 52 internal::DragDropController* ShellTestApi::drag_drop_controller() {
53 return shell_->drag_drop_controller_.get(); 53 return shell_->drag_drop_controller_.get();
54 } 54 }
55 55
56 internal::AppListController* ShellTestApi::app_list_controller() { 56 internal::AppListController* ShellTestApi::app_list_controller() {
57 return shell_->app_list_controller_.get(); 57 return shell_->app_list_controller_.get();
58 } 58 }
59 59
60 void ShellTestApi::DisableOutputConfiguratorAnimation() { 60 void ShellTestApi::DisableOutputConfiguratorAnimation() {
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
62 if (shell_->output_configurator_animation_) { 62 if (shell_->output_configurator_animation_) {
63 shell_->output_configurator_->RemoveObserver( 63 shell_->output_configurator_->RemoveObserver(
64 shell_->output_configurator_animation_.get()); 64 shell_->output_configurator_animation_.get());
65 shell_->output_configurator_animation_.reset(); 65 shell_->output_configurator_animation_.reset();
66 } 66 }
67 #endif // defined(OS_CHROMEOS) 67 #endif // defined(OS_CHROMEOS)
68 } 68 }
69 69
70 void ShellTestApi::SetLauncherDelegate(LauncherDelegate* delegate) { 70 void ShellTestApi::SetLauncherDelegate(LauncherDelegate* delegate) {
71 shell_->launcher_delegate_.reset(delegate); 71 shell_->launcher_delegate_.reset(delegate);
72 } 72 }
73 73
74 } // namespace test 74 } // namespace test
75 } // namespace ash 75 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_launcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698