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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
738 // VideoDetectorObserver interface. | 738 // VideoDetectorObserver interface. |
739 video_activity_notifier_.reset(); | 739 video_activity_notifier_.reset(); |
740 #endif // defined(OS_CHROMEOS) | 740 #endif // defined(OS_CHROMEOS) |
741 video_detector_.reset(); | 741 video_detector_.reset(); |
742 high_contrast_controller_.reset(); | 742 high_contrast_controller_.reset(); |
743 | 743 |
744 shadow_controller_.reset(); | 744 shadow_controller_.reset(); |
745 resize_shadow_controller_.reset(); | 745 resize_shadow_controller_.reset(); |
746 | 746 |
747 window_cycle_controller_.reset(); | 747 window_cycle_controller_.reset(); |
748 | |
749 // Need to ensure that the WindowSelector is properly destroyed and cleaned up | |
750 // prior to deleting the |window_selector_controller_|. See | |
751 // WindowSelectorController docmentation for more info. | |
jonross
2015/01/15 13:37:47
nit: documentation
bruthig
2015/01/15 18:27:24
Done.
| |
752 if (window_selector_controller_->IsSelecting()) | |
753 window_selector_controller_->ToggleOverview(); | |
748 window_selector_controller_.reset(); | 754 window_selector_controller_.reset(); |
749 mru_window_tracker_.reset(); | 755 mru_window_tracker_.reset(); |
750 | 756 |
751 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| | 757 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| |
752 // and has window observers. | 758 // and has window observers. |
753 shelf_window_watcher_.reset(); | 759 shelf_window_watcher_.reset(); |
754 | 760 |
755 // Destroy all child windows including widgets. | 761 // Destroy all child windows including widgets. |
756 display_controller_->CloseChildWindows(); | 762 display_controller_->CloseChildWindows(); |
757 display_controller_->CloseMirroringDisplay(); | 763 display_controller_->CloseMirroringDisplay(); |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1161 //////////////////////////////////////////////////////////////////////////////// | 1167 //////////////////////////////////////////////////////////////////////////////// |
1162 // Shell, aura::client::ActivationChangeObserver implementation: | 1168 // Shell, aura::client::ActivationChangeObserver implementation: |
1163 | 1169 |
1164 void Shell::OnWindowActivated(aura::Window* gained_active, | 1170 void Shell::OnWindowActivated(aura::Window* gained_active, |
1165 aura::Window* lost_active) { | 1171 aura::Window* lost_active) { |
1166 if (gained_active) | 1172 if (gained_active) |
1167 target_root_window_ = gained_active->GetRootWindow(); | 1173 target_root_window_ = gained_active->GetRootWindow(); |
1168 } | 1174 } |
1169 | 1175 |
1170 } // namespace ash | 1176 } // namespace ash |
OLD | NEW |