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 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 } | 659 } |
660 | 660 |
661 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) { | 661 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) { |
662 root->set_focus_manager(focus_manager_.get()); | 662 root->set_focus_manager(focus_manager_.get()); |
663 internal::RootWindowController* controller = | 663 internal::RootWindowController* controller = |
664 new internal::RootWindowController(root); | 664 new internal::RootWindowController(root); |
665 controller->CreateContainers(); | 665 controller->CreateContainers(); |
666 InitRootWindowController(controller); | 666 InitRootWindowController(controller); |
667 controller->root_window_layout()->OnWindowResized(); | 667 controller->root_window_layout()->OnWindowResized(); |
668 desktop_background_controller_->OnRootWindowAdded(root); | 668 desktop_background_controller_->OnRootWindowAdded(root); |
| 669 high_contrast_controller_->OnRootWindowAdded(root); |
669 root->ShowRootWindow(); | 670 root->ShowRootWindow(); |
670 // Activate new root for testing. | 671 // Activate new root for testing. |
671 active_root_window_ = root; | 672 active_root_window_ = root; |
672 } | 673 } |
673 | 674 |
674 void Shell::DoInitialWorkspaceAnimation() { | 675 void Shell::DoInitialWorkspaceAnimation() { |
675 return GetPrimaryRootWindowController()->workspace_controller()-> | 676 return GetPrimaryRootWindowController()->workspace_controller()-> |
676 DoInitialAnimation(); | 677 DoInitialAnimation(); |
677 } | 678 } |
678 | 679 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 } | 764 } |
764 | 765 |
765 void Shell::ShowCursor(bool visible) { | 766 void Shell::ShowCursor(bool visible) { |
766 RootWindowList root_windows = GetAllRootWindows(); | 767 RootWindowList root_windows = GetAllRootWindows(); |
767 for (RootWindowList::iterator iter = root_windows.begin(); | 768 for (RootWindowList::iterator iter = root_windows.begin(); |
768 iter != root_windows.end(); ++iter) | 769 iter != root_windows.end(); ++iter) |
769 (*iter)->ShowCursor(visible); | 770 (*iter)->ShowCursor(visible); |
770 } | 771 } |
771 | 772 |
772 } // namespace ash | 773 } // namespace ash |
OLD | NEW |