| 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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 669 } | 669 } |
| 670 | 670 |
| 671 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) { | 671 void Shell::InitRootWindowForSecondaryDisplay(aura::RootWindow* root) { |
| 672 root->set_focus_manager(focus_manager_.get()); | 672 root->set_focus_manager(focus_manager_.get()); |
| 673 internal::RootWindowController* controller = | 673 internal::RootWindowController* controller = |
| 674 new internal::RootWindowController(root); | 674 new internal::RootWindowController(root); |
| 675 controller->CreateContainers(); | 675 controller->CreateContainers(); |
| 676 InitRootWindowController(controller); | 676 InitRootWindowController(controller); |
| 677 controller->root_window_layout()->OnWindowResized(); | 677 controller->root_window_layout()->OnWindowResized(); |
| 678 desktop_background_controller_->OnRootWindowAdded(root); | 678 desktop_background_controller_->OnRootWindowAdded(root); |
| 679 high_contrast_controller_->OnRootWindowAdded(root); |
| 679 root->ShowRootWindow(); | 680 root->ShowRootWindow(); |
| 680 // Activate new root for testing. | 681 // Activate new root for testing. |
| 681 active_root_window_ = root; | 682 active_root_window_ = root; |
| 682 } | 683 } |
| 683 | 684 |
| 684 void Shell::DoInitialWorkspaceAnimation() { | 685 void Shell::DoInitialWorkspaceAnimation() { |
| 685 return GetPrimaryRootWindowController()->workspace_controller()-> | 686 return GetPrimaryRootWindowController()->workspace_controller()-> |
| 686 DoInitialAnimation(); | 687 DoInitialAnimation(); |
| 687 } | 688 } |
| 688 | 689 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 } | 774 } |
| 774 | 775 |
| 775 void Shell::ShowCursor(bool visible) { | 776 void Shell::ShowCursor(bool visible) { |
| 776 RootWindowList root_windows = GetAllRootWindows(); | 777 RootWindowList root_windows = GetAllRootWindows(); |
| 777 for (RootWindowList::iterator iter = root_windows.begin(); | 778 for (RootWindowList::iterator iter = root_windows.begin(); |
| 778 iter != root_windows.end(); ++iter) | 779 iter != root_windows.end(); ++iter) |
| 779 (*iter)->ShowCursor(visible); | 780 (*iter)->ShowCursor(visible); |
| 780 } | 781 } |
| 781 | 782 |
| 782 } // namespace ash | 783 } // namespace ash |
| OLD | NEW |