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

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

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 10 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/tooltips/tooltip_controller_unittest.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/shell.h" 8 #include "ash/shell.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 17 matching lines...) Expand all
28 28
29 internal::WorkspaceController* ShellTestApi::workspace_controller() { 29 internal::WorkspaceController* ShellTestApi::workspace_controller() {
30 return shell_->GetPrimaryRootWindowController()->workspace_controller(); 30 return shell_->GetPrimaryRootWindowController()->workspace_controller();
31 } 31 }
32 32
33 internal::ScreenPositionController* 33 internal::ScreenPositionController*
34 ShellTestApi::screen_position_controller() { 34 ShellTestApi::screen_position_controller() {
35 return shell_->screen_position_controller_.get(); 35 return shell_->screen_position_controller_.get();
36 } 36 }
37 37
38 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {
39 return shell_->native_cursor_manager_;
40 }
41
38 LauncherModel* ShellTestApi::launcher_model() { 42 LauncherModel* ShellTestApi::launcher_model() {
39 return shell_->launcher_model_.get(); 43 return shell_->launcher_model_.get();
40 } 44 }
41 45
42 } // namespace test 46 } // namespace test
43 } // namespace ash 47 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698