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