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

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

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 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
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/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/shelf/shelf_delegate.h" 9 #include "ash/shelf/shelf_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 11
12 #if defined(OS_CHROMEOS) 12 #if defined(OS_CHROMEOS)
13 #include "ash/display/display_configurator_animation.h" 13 #include "ash/display/display_configurator_animation.h"
14 #include "ui/display/chromeos/display_configurator.h" 14 #include "ui/display/chromeos/display_configurator.h"
15 #endif 15 #endif
16 16
17 namespace ash { 17 namespace ash {
18 namespace test { 18 namespace test {
19 19
20 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 20 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
21 21
22 RootWindowLayoutManager* ShellTestApi::root_window_layout() { 22 RootWindowLayoutManager* ShellTestApi::root_window_layout() {
23 return shell_->GetPrimaryRootWindowController()->root_window_layout(); 23 return shell_->GetPrimaryRootWindowController()->root_window_layout();
24 } 24 }
25 25
26 wm::InputMethodEventFilter*
27 ShellTestApi::input_method_event_filter() {
28 return shell_->input_method_filter_.get();
29 }
30
31 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { 26 SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() {
32 return shell_->system_gesture_filter_.get(); 27 return shell_->system_gesture_filter_.get();
33 } 28 }
34 29
35 WorkspaceController* ShellTestApi::workspace_controller() { 30 WorkspaceController* ShellTestApi::workspace_controller() {
36 return shell_->GetPrimaryRootWindowController()->workspace_controller(); 31 return shell_->GetPrimaryRootWindowController()->workspace_controller();
37 } 32 }
38 33
39 ScreenPositionController* ShellTestApi::screen_position_controller() { 34 ScreenPositionController* ShellTestApi::screen_position_controller() {
40 return shell_->screen_position_controller_.get(); 35 return shell_->screen_position_controller_.get();
(...skipping 29 matching lines...) Expand all
70 shell_->shelf_delegate_.reset(delegate); 65 shell_->shelf_delegate_.reset(delegate);
71 } 66 }
72 67
73 void ShellTestApi::SetSessionStateDelegate( 68 void ShellTestApi::SetSessionStateDelegate(
74 SessionStateDelegate* session_state_delegate) { 69 SessionStateDelegate* session_state_delegate) {
75 shell_->session_state_delegate_.reset(session_state_delegate); 70 shell_->session_state_delegate_.reset(session_state_delegate);
76 } 71 }
77 72
78 } // namespace test 73 } // namespace test
79 } // namespace ash 74 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698