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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 | 173 |
174 //////////////////////////////////////////////////////////////////////////////// | 174 //////////////////////////////////////////////////////////////////////////////// |
175 // Shell, public: | 175 // Shell, public: |
176 | 176 |
177 Shell::Shell(ShellDelegate* delegate) | 177 Shell::Shell(ShellDelegate* delegate) |
178 : screen_(new ScreenAsh), | 178 : screen_(new ScreenAsh), |
179 active_root_window_(NULL), | 179 active_root_window_(NULL), |
180 env_filter_(NULL), | 180 env_filter_(NULL), |
181 delegate_(delegate), | 181 delegate_(delegate), |
182 #if defined(OS_CHROMEOS) | 182 #if defined(OS_CHROMEOS) |
183 output_configurator_(new chromeos::OutputConfigurator()), | 183 output_configurator_(new chromeos::OutputConfigurator( |
| 184 internal::DisplayController::IsExtendedDesktopEnabled())), |
184 #endif // defined(OS_CHROMEOS) | 185 #endif // defined(OS_CHROMEOS) |
185 shelf_(NULL), | 186 shelf_(NULL), |
186 panel_layout_manager_(NULL), | 187 panel_layout_manager_(NULL), |
187 status_area_widget_(NULL), | 188 status_area_widget_(NULL), |
188 browser_context_(NULL) { | 189 browser_context_(NULL) { |
189 gfx::Screen::SetInstance(screen_); | 190 gfx::Screen::SetInstance(screen_); |
190 ui_controls::InstallUIControlsAura(internal::CreateUIControls()); | 191 ui_controls::InstallUIControlsAura(internal::CreateUIControls()); |
191 #if defined(OS_CHROMEOS) | 192 #if defined(OS_CHROMEOS) |
192 // OutputConfigurator needs to get events regarding added/removed outputs. | 193 // OutputConfigurator needs to get events regarding added/removed outputs. |
193 static_cast<aura::DispatcherLinux*>( | 194 static_cast<aura::DispatcherLinux*>( |
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 } | 783 } |
783 | 784 |
784 void Shell::ShowCursor(bool visible) { | 785 void Shell::ShowCursor(bool visible) { |
785 RootWindowList root_windows = GetAllRootWindows(); | 786 RootWindowList root_windows = GetAllRootWindows(); |
786 for (RootWindowList::iterator iter = root_windows.begin(); | 787 for (RootWindowList::iterator iter = root_windows.begin(); |
787 iter != root_windows.end(); ++iter) | 788 iter != root_windows.end(); ++iter) |
788 (*iter)->ShowCursor(visible); | 789 (*iter)->ShowCursor(visible); |
789 } | 790 } |
790 | 791 |
791 } // namespace ash | 792 } // namespace ash |
OLD | NEW |