Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/accelerators/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 | 165 |
| 166 internal::SystemGestureEventFilter* | 166 internal::SystemGestureEventFilter* |
| 167 Shell::TestApi::system_gesture_event_filter() { | 167 Shell::TestApi::system_gesture_event_filter() { |
| 168 return shell_->system_gesture_filter_.get(); | 168 return shell_->system_gesture_filter_.get(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 internal::WorkspaceController* Shell::TestApi::workspace_controller() { | 171 internal::WorkspaceController* Shell::TestApi::workspace_controller() { |
| 172 return shell_->GetPrimaryRootWindowController()->workspace_controller(); | 172 return shell_->GetPrimaryRootWindowController()->workspace_controller(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 internal::ScreenPositionController* | |
| 176 Shell::TestApi::screen_position_controller() { | |
|
oshima
2012/09/19 01:46:27
indent (like other accessors)
mazda
2012/09/19 02:06:56
Done.
| |
| 177 return shell_->screen_position_controller_.get(); | |
| 178 } | |
| 179 | |
| 175 //////////////////////////////////////////////////////////////////////////////// | 180 //////////////////////////////////////////////////////////////////////////////// |
| 176 // Shell, public: | 181 // Shell, public: |
| 177 | 182 |
| 178 Shell::Shell(ShellDelegate* delegate) | 183 Shell::Shell(ShellDelegate* delegate) |
| 179 : screen_(new ScreenAsh), | 184 : screen_(new ScreenAsh), |
| 180 active_root_window_(NULL), | 185 active_root_window_(NULL), |
| 181 env_filter_(NULL), | 186 env_filter_(NULL), |
| 182 delegate_(delegate), | 187 delegate_(delegate), |
| 183 #if defined(OS_CHROMEOS) | 188 #if defined(OS_CHROMEOS) |
| 184 output_configurator_(new chromeos::OutputConfigurator()), | 189 output_configurator_(new chromeos::OutputConfigurator()), |
| (...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 770 } | 775 } |
| 771 | 776 |
| 772 void Shell::ShowCursor(bool visible) { | 777 void Shell::ShowCursor(bool visible) { |
| 773 RootWindowList root_windows = GetAllRootWindows(); | 778 RootWindowList root_windows = GetAllRootWindows(); |
| 774 for (RootWindowList::iterator iter = root_windows.begin(); | 779 for (RootWindowList::iterator iter = root_windows.begin(); |
| 775 iter != root_windows.end(); ++iter) | 780 iter != root_windows.end(); ++iter) |
| 776 (*iter)->ShowCursor(visible); | 781 (*iter)->ShowCursor(visible); |
| 777 } | 782 } |
| 778 | 783 |
| 779 } // namespace ash | 784 } // namespace ash |
| OLD | NEW |