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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 } | 690 } |
691 } | 691 } |
692 | 692 |
693 void Shell::InitRootWindowController( | 693 void Shell::InitRootWindowController( |
694 internal::RootWindowController* controller) { | 694 internal::RootWindowController* controller) { |
695 aura::RootWindow* root_window = controller->root_window(); | 695 aura::RootWindow* root_window = controller->root_window(); |
696 DCHECK(activation_controller_.get()); | 696 DCHECK(activation_controller_.get()); |
697 DCHECK(visibility_controller_.get()); | 697 DCHECK(visibility_controller_.get()); |
698 DCHECK(drag_drop_controller_.get()); | 698 DCHECK(drag_drop_controller_.get()); |
699 DCHECK(capture_controller_.get()); | 699 DCHECK(capture_controller_.get()); |
| 700 DCHECK(window_cycle_controller_.get()); |
700 | 701 |
701 root_window->set_focus_manager(focus_manager_.get()); | 702 root_window->set_focus_manager(focus_manager_.get()); |
702 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window); | 703 input_method_filter_->SetInputMethodPropertyInRootWindow(root_window); |
703 aura::client::SetActivationClient(root_window, activation_controller_.get()); | 704 aura::client::SetActivationClient(root_window, activation_controller_.get()); |
704 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); | 705 aura::client::SetVisibilityClient(root_window, visibility_controller_.get()); |
705 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); | 706 aura::client::SetDragDropClient(root_window, drag_drop_controller_.get()); |
706 aura::client::SetCaptureClient(root_window, capture_controller_.get()); | 707 aura::client::SetCaptureClient(root_window, capture_controller_.get()); |
707 aura::client::SetScreenPositionClient(root_window, | 708 aura::client::SetScreenPositionClient(root_window, |
708 screen_position_controller_.get()); | 709 screen_position_controller_.get()); |
709 aura::client::SetCursorClient(root_window, &cursor_manager_); | 710 aura::client::SetCursorClient(root_window, &cursor_manager_); |
(...skipping 11 matching lines...) Expand all Loading... |
721 | 722 |
722 // TODO(oshima): Move the instance to RootWindowController when | 723 // TODO(oshima): Move the instance to RootWindowController when |
723 // the extended desktop is enabled by default. | 724 // the extended desktop is enabled by default. |
724 internal::AlwaysOnTopController* always_on_top_controller = | 725 internal::AlwaysOnTopController* always_on_top_controller = |
725 new internal::AlwaysOnTopController; | 726 new internal::AlwaysOnTopController; |
726 always_on_top_controller->SetContainers( | 727 always_on_top_controller->SetContainers( |
727 root_window->GetChildById(internal::kShellWindowId_DefaultContainer), | 728 root_window->GetChildById(internal::kShellWindowId_DefaultContainer), |
728 root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer)); | 729 root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer)); |
729 root_window->SetProperty(internal::kAlwaysOnTopControllerKey, | 730 root_window->SetProperty(internal::kAlwaysOnTopControllerKey, |
730 always_on_top_controller); | 731 always_on_top_controller); |
| 732 |
| 733 window_cycle_controller_->OnRootWindowAdded(root_window); |
731 } | 734 } |
732 | 735 |
733 //////////////////////////////////////////////////////////////////////////////// | 736 //////////////////////////////////////////////////////////////////////////////// |
734 // Shell, private: | 737 // Shell, private: |
735 | 738 |
736 void Shell::InitLayoutManagersForPrimaryDisplay( | 739 void Shell::InitLayoutManagersForPrimaryDisplay( |
737 internal::RootWindowController* controller) { | 740 internal::RootWindowController* controller) { |
738 DCHECK(status_area_widget_); | 741 DCHECK(status_area_widget_); |
739 | 742 |
740 internal::ShelfLayoutManager* shelf_layout_manager = | 743 internal::ShelfLayoutManager* shelf_layout_manager = |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 } | 785 } |
783 | 786 |
784 void Shell::ShowCursor(bool visible) { | 787 void Shell::ShowCursor(bool visible) { |
785 RootWindowList root_windows = GetAllRootWindows(); | 788 RootWindowList root_windows = GetAllRootWindows(); |
786 for (RootWindowList::iterator iter = root_windows.begin(); | 789 for (RootWindowList::iterator iter = root_windows.begin(); |
787 iter != root_windows.end(); ++iter) | 790 iter != root_windows.end(); ++iter) |
788 (*iter)->ShowCursor(visible); | 791 (*iter)->ShowCursor(visible); |
789 } | 792 } |
790 | 793 |
791 } // namespace ash | 794 } // namespace ash |
OLD | NEW |