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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 #endif | 404 #endif |
405 | 405 |
406 system_gesture_filter_.reset(new internal::SystemGestureEventFilter); | 406 system_gesture_filter_.reset(new internal::SystemGestureEventFilter); |
407 AddEnvEventFilter(system_gesture_filter_.get()); | 407 AddEnvEventFilter(system_gesture_filter_.get()); |
408 | 408 |
409 capture_controller_.reset(new internal::CaptureController); | 409 capture_controller_.reset(new internal::CaptureController); |
410 | 410 |
411 internal::RootWindowController* root_window_controller = | 411 internal::RootWindowController* root_window_controller = |
412 new internal::RootWindowController(root_window); | 412 new internal::RootWindowController(root_window); |
413 root_window_controller->CreateContainers(); | 413 root_window_controller->CreateContainers(); |
| 414 root_window_controller->CreateSystemBackground( |
| 415 delegate_.get() ? delegate_->IsFirstRunAfterBoot() : false); |
414 | 416 |
415 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 417 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
416 | 418 |
417 if (command_line->HasSwitch(switches::kAshTouchHud)) { | 419 if (command_line->HasSwitch(switches::kAshTouchHud)) { |
418 touch_observer_hud_.reset(new internal::TouchObserverHUD); | 420 touch_observer_hud_.reset(new internal::TouchObserverHUD); |
419 AddEnvEventFilter(touch_observer_hud_.get()); | 421 AddEnvEventFilter(touch_observer_hud_.get()); |
420 } | 422 } |
421 | 423 |
422 mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter()); | 424 mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter()); |
423 AddEnvEventFilter(mouse_cursor_filter_.get()); | 425 AddEnvEventFilter(mouse_cursor_filter_.get()); |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
768 } | 770 } |
769 | 771 |
770 void Shell::ShowCursor(bool visible) { | 772 void Shell::ShowCursor(bool visible) { |
771 RootWindowList root_windows = GetAllRootWindows(); | 773 RootWindowList root_windows = GetAllRootWindows(); |
772 for (RootWindowList::iterator iter = root_windows.begin(); | 774 for (RootWindowList::iterator iter = root_windows.begin(); |
773 iter != root_windows.end(); ++iter) | 775 iter != root_windows.end(); ++iter) |
774 (*iter)->ShowCursor(visible); | 776 (*iter)->ShowCursor(visible); |
775 } | 777 } |
776 | 778 |
777 } // namespace ash | 779 } // namespace ash |
OLD | NEW |