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/accelerator_controller.h" | 10 #include "ash/accelerators/accelerator_controller.h" |
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
751 window_cycle_controller_.reset(); | 751 window_cycle_controller_.reset(); |
752 window_selector_controller_.reset(); | 752 window_selector_controller_.reset(); |
753 mru_window_tracker_.reset(); | 753 mru_window_tracker_.reset(); |
754 | 754 |
755 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| | 755 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| |
756 // and has window observers. | 756 // and has window observers. |
757 shelf_window_watcher_.reset(); | 757 shelf_window_watcher_.reset(); |
758 | 758 |
759 // Destroy all child windows including widgets. | 759 // Destroy all child windows including widgets. |
760 display_controller_->CloseChildWindows(); | 760 display_controller_->CloseChildWindows(); |
761 display_controller_->CloseMirroringDisplay(); | |
762 | 761 |
763 // Chrome implementation of shelf delegate depends on FocusClient, | 762 // Chrome implementation of shelf delegate depends on FocusClient, |
764 // so must be deleted before |focus_client_|. | 763 // so must be deleted before |focus_client_|. |
765 shelf_delegate_.reset(); | 764 shelf_delegate_.reset(); |
766 focus_client_.reset(); | 765 focus_client_.reset(); |
767 | 766 |
768 // Destroy SystemTrayNotifier after destroying SystemTray as TrayItems | 767 // Destroy SystemTrayNotifier after destroying SystemTray as TrayItems |
769 // needs to remove observers from it. | 768 // needs to remove observers from it. |
770 system_tray_notifier_.reset(); | 769 system_tray_notifier_.reset(); |
771 | 770 |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1177 //////////////////////////////////////////////////////////////////////////////// | 1176 //////////////////////////////////////////////////////////////////////////////// |
1178 // Shell, aura::client::ActivationChangeObserver implementation: | 1177 // Shell, aura::client::ActivationChangeObserver implementation: |
1179 | 1178 |
1180 void Shell::OnWindowActivated(aura::Window* gained_active, | 1179 void Shell::OnWindowActivated(aura::Window* gained_active, |
1181 aura::Window* lost_active) { | 1180 aura::Window* lost_active) { |
1182 if (gained_active) | 1181 if (gained_active) |
1183 target_root_window_ = gained_active->GetRootWindow(); | 1182 target_root_window_ = gained_active->GetRootWindow(); |
1184 } | 1183 } |
1185 | 1184 |
1186 } // namespace ash | 1185 } // namespace ash |
OLD | NEW |