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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 } | 389 } |
390 | 390 |
391 void Shell::OnMaximizeModeStarted() { | 391 void Shell::OnMaximizeModeStarted() { |
392 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeStarted()); | 392 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeStarted()); |
393 } | 393 } |
394 | 394 |
395 void Shell::OnMaximizeModeEnded() { | 395 void Shell::OnMaximizeModeEnded() { |
396 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeEnded()); | 396 FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeEnded()); |
397 } | 397 } |
398 | 398 |
| 399 void Shell::OnRootWindowAdded(aura::Window* root_window) { |
| 400 FOR_EACH_OBSERVER(ShellObserver, observers_, OnRootWindowAdded(root_window)); |
| 401 } |
| 402 |
399 void Shell::CreateShelf() { | 403 void Shell::CreateShelf() { |
400 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 404 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
401 for (RootWindowControllerList::iterator iter = controllers.begin(); | 405 for (RootWindowControllerList::iterator iter = controllers.begin(); |
402 iter != controllers.end(); ++iter) | 406 iter != controllers.end(); ++iter) |
403 (*iter)->shelf()->CreateShelf(); | 407 (*iter)->shelf()->CreateShelf(); |
404 } | 408 } |
405 | 409 |
406 void Shell::CreateKeyboard() { | 410 void Shell::CreateKeyboard() { |
407 // TODO(bshe): Primary root window controller may not be the controller to | 411 // TODO(bshe): Primary root window controller may not be the controller to |
408 // attach virtual keyboard. See http://crbug.com/303429 | 412 // attach virtual keyboard. See http://crbug.com/303429 |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
691 // Controllers who have WindowObserver added must be deleted | 695 // Controllers who have WindowObserver added must be deleted |
692 // before |display_controller_| is deleted. | 696 // before |display_controller_| is deleted. |
693 | 697 |
694 #if defined(OS_CHROMEOS) | 698 #if defined(OS_CHROMEOS) |
695 // VideoActivityNotifier must be deleted before |video_detector_| is | 699 // VideoActivityNotifier must be deleted before |video_detector_| is |
696 // deleted because it's observing video activity through | 700 // deleted because it's observing video activity through |
697 // VideoDetectorObserver interface. | 701 // VideoDetectorObserver interface. |
698 video_activity_notifier_.reset(); | 702 video_activity_notifier_.reset(); |
699 #endif // defined(OS_CHROMEOS) | 703 #endif // defined(OS_CHROMEOS) |
700 video_detector_.reset(); | 704 video_detector_.reset(); |
| 705 high_contrast_controller_.reset(); |
701 | 706 |
702 shadow_controller_.reset(); | 707 shadow_controller_.reset(); |
703 resize_shadow_controller_.reset(); | 708 resize_shadow_controller_.reset(); |
704 | 709 |
705 window_selector_controller_.reset(); | 710 window_selector_controller_.reset(); |
706 mru_window_tracker_.reset(); | 711 mru_window_tracker_.reset(); |
707 | 712 |
708 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| | 713 // |shelf_window_watcher_| has a weak pointer to |shelf_Model_| |
709 // and has window observers. | 714 // and has window observers. |
710 shelf_window_watcher_.reset(); | 715 shelf_window_watcher_.reset(); |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1104 //////////////////////////////////////////////////////////////////////////////// | 1109 //////////////////////////////////////////////////////////////////////////////// |
1105 // Shell, aura::client::ActivationChangeObserver implementation: | 1110 // Shell, aura::client::ActivationChangeObserver implementation: |
1106 | 1111 |
1107 void Shell::OnWindowActivated(aura::Window* gained_active, | 1112 void Shell::OnWindowActivated(aura::Window* gained_active, |
1108 aura::Window* lost_active) { | 1113 aura::Window* lost_active) { |
1109 if (gained_active) | 1114 if (gained_active) |
1110 target_root_window_ = gained_active->GetRootWindow(); | 1115 target_root_window_ = gained_active->GetRootWindow(); |
1111 } | 1116 } |
1112 | 1117 |
1113 } // namespace ash | 1118 } // namespace ash |
OLD | NEW |