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

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

Issue 2932563002: Implement cursor changing on Mushrome (Closed)
Patch Set: oshima patch take 2 Created 3 years, 6 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
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/wm/ash_native_cursor_manager.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 <utility> 7 #include <utility>
8 8
9 #include "ash/palette_delegate.h" 9 #include "ash/palette_delegate.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 11 matching lines...) Expand all
22 } 22 }
23 23
24 WorkspaceController* ShellTestApi::workspace_controller() { 24 WorkspaceController* ShellTestApi::workspace_controller() {
25 return shell_->GetPrimaryRootWindowController()->workspace_controller(); 25 return shell_->GetPrimaryRootWindowController()->workspace_controller();
26 } 26 }
27 27
28 ScreenPositionController* ShellTestApi::screen_position_controller() { 28 ScreenPositionController* ShellTestApi::screen_position_controller() {
29 return shell_->screen_position_controller_.get(); 29 return shell_->screen_position_controller_.get();
30 } 30 }
31 31
32 AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() { 32 NativeCursorManagerAsh* ShellTestApi::native_cursor_manager_ash() {
33 return shell_->native_cursor_manager_; 33 return shell_->native_cursor_manager_;
34 } 34 }
35 35
36 DragDropController* ShellTestApi::drag_drop_controller() { 36 DragDropController* ShellTestApi::drag_drop_controller() {
37 return shell_->drag_drop_controller_.get(); 37 return shell_->drag_drop_controller_.get();
38 } 38 }
39 39
40 void ShellTestApi::SetPaletteDelegate( 40 void ShellTestApi::SetPaletteDelegate(
41 std::unique_ptr<PaletteDelegate> palette_delegate) { 41 std::unique_ptr<PaletteDelegate> palette_delegate) {
42 shell_->palette_delegate_ = std::move(palette_delegate); 42 shell_->palette_delegate_ = std::move(palette_delegate);
43 } 43 }
44 44
45 } // namespace test 45 } // namespace test
46 } // namespace ash 46 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/shell_test_api.h ('k') | ash/wm/ash_native_cursor_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698