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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months 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_shell_delegate.cc » ('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/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
11 #if defined(OS_CHROMEOS) 11 #if defined(OS_CHROMEOS)
12 #include "ash/display/output_configurator_animation.h" 12 #include "ash/display/output_configurator_animation.h"
13 #include "ui/display/chromeos/output_configurator.h" 13 #include "ui/display/chromeos/output_configurator.h"
14 #endif 14 #endif
15 15
16 namespace ash { 16 namespace ash {
17 namespace test { 17 namespace test {
18 18
19 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 19 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
20 20
21 internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() { 21 RootWindowLayoutManager* ShellTestApi::root_window_layout() {
22 return shell_->GetPrimaryRootWindowController()->root_window_layout(); 22 return shell_->GetPrimaryRootWindowController()->root_window_layout();
23 } 23 }
24 24
25 wm::InputMethodEventFilter* 25 wm::InputMethodEventFilter*
26 ShellTestApi::input_method_event_filter() { 26 ShellTestApi::input_method_event_filter() {
27 return shell_->input_method_filter_.get(); 27 return shell_->input_method_filter_.get();
28 } 28 }
29 29
30 internal::SystemGestureEventFilter* 30 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
31 ShellTestApi::system_gesture_event_filter() {
32 return shell_->system_gesture_filter_.get(); 31 return shell_->system_gesture_filter_.get();
33 } 32 }
34 33
35 internal::WorkspaceController* ShellTestApi::workspace_controller() { 34 WorkspaceController* ShellTestApi::workspace_controller() {
36 return shell_->GetPrimaryRootWindowController()->workspace_controller(); 35 return shell_->GetPrimaryRootWindowController()->workspace_controller();
37 } 36 }
38 37
39 internal::ScreenPositionController* 38 ScreenPositionController* ShellTestApi::screen_position_controller() {
40 ShellTestApi::screen_position_controller() {
41 return shell_->screen_position_controller_.get(); 39 return shell_->screen_position_controller_.get();
42 } 40 }
43 41
44 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { 42 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
45 return shell_->native_cursor_manager_; 43 return shell_->native_cursor_manager_;
46 } 44 }
47 45
48 ShelfModel* ShellTestApi::shelf_model() { 46 ShelfModel* ShellTestApi::shelf_model() {
49 return shell_->shelf_model_.get(); 47 return shell_->shelf_model_.get();
50 } 48 }
51 49
52 internal::DragDropController* ShellTestApi::drag_drop_controller() { 50 DragDropController* ShellTestApi::drag_drop_controller() {
53 return shell_->drag_drop_controller_.get(); 51 return shell_->drag_drop_controller_.get();
54 } 52 }
55 53
56 internal::AppListController* ShellTestApi::app_list_controller() { 54 AppListController* ShellTestApi::app_list_controller() {
57 return shell_->app_list_controller_.get(); 55 return shell_->app_list_controller_.get();
58 } 56 }
59 57
60 internal::MaximizeModeWindowManager* 58 MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
61 ShellTestApi::maximize_mode_window_manager() {
62 return shell_->maximize_mode_window_manager_.get(); 59 return shell_->maximize_mode_window_manager_.get();
63 } 60 }
64 61
65 void ShellTestApi::DisableOutputConfiguratorAnimation() { 62 void ShellTestApi::DisableOutputConfiguratorAnimation() {
66 #if defined(OS_CHROMEOS) 63 #if defined(OS_CHROMEOS)
67 if (shell_->output_configurator_animation_) { 64 if (shell_->output_configurator_animation_) {
68 shell_->output_configurator_->RemoveObserver( 65 shell_->output_configurator_->RemoveObserver(
69 shell_->output_configurator_animation_.get()); 66 shell_->output_configurator_animation_.get());
70 shell_->output_configurator_animation_.reset(); 67 shell_->output_configurator_animation_.reset();
71 } 68 }
72 #endif // defined(OS_CHROMEOS) 69 #endif // defined(OS_CHROMEOS)
73 } 70 }
74 71
75 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { 72 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
76 shell_->shelf_delegate_.reset(delegate); 73 shell_->shelf_delegate_.reset(delegate);
77 } 74 }
78 75
79 } // namespace test 76 } // namespace test
80 } // namespace ash 77 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698