| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 #include "ui/wm/core/visibility_controller.h" | 114 #include "ui/wm/core/visibility_controller.h" |
| 115 #include "ui/wm/core/window_modality_controller.h" | 115 #include "ui/wm/core/window_modality_controller.h" |
| 116 | 116 |
| 117 #if defined(OS_CHROMEOS) | 117 #if defined(OS_CHROMEOS) |
| 118 #if defined(USE_X11) | 118 #if defined(USE_X11) |
| 119 #include "ui/gfx/x/x11_types.h" | 119 #include "ui/gfx/x/x11_types.h" |
| 120 #endif // defined(USE_X11) | 120 #endif // defined(USE_X11) |
| 121 #include "ash/accelerators/magnifier_key_scroller.h" | 121 #include "ash/accelerators/magnifier_key_scroller.h" |
| 122 #include "ash/accelerators/spoken_feedback_toggler.h" | 122 #include "ash/accelerators/spoken_feedback_toggler.h" |
| 123 #include "ash/ash_constants.h" | 123 #include "ash/ash_constants.h" |
| 124 #include "ash/content/display/display_color_manager_chromeos.h" |
| 124 #include "ash/content/display/screen_orientation_controller_chromeos.h" | 125 #include "ash/content/display/screen_orientation_controller_chromeos.h" |
| 125 #include "ash/display/display_change_observer_chromeos.h" | 126 #include "ash/display/display_change_observer_chromeos.h" |
| 126 #include "ash/display/display_configurator_animation.h" | 127 #include "ash/display/display_configurator_animation.h" |
| 127 #include "ash/display/display_error_observer_chromeos.h" | 128 #include "ash/display/display_error_observer_chromeos.h" |
| 128 #include "ash/display/projecting_observer_chromeos.h" | 129 #include "ash/display/projecting_observer_chromeos.h" |
| 129 #include "ash/display/resolution_notification_controller.h" | 130 #include "ash/display/resolution_notification_controller.h" |
| 130 #include "ash/sticky_keys/sticky_keys_controller.h" | 131 #include "ash/sticky_keys/sticky_keys_controller.h" |
| 131 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" | 132 #include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h" |
| 132 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" | 133 #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" |
| 133 #include "ash/system/chromeos/power/power_event_observer.h" | 134 #include "ash/system/chromeos/power/power_event_observer.h" |
| (...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 display_controller_->Shutdown(); | 805 display_controller_->Shutdown(); |
| 805 display_controller_.reset(); | 806 display_controller_.reset(); |
| 806 screen_position_controller_.reset(); | 807 screen_position_controller_.reset(); |
| 807 accessibility_delegate_.reset(); | 808 accessibility_delegate_.reset(); |
| 808 new_window_delegate_.reset(); | 809 new_window_delegate_.reset(); |
| 809 media_delegate_.reset(); | 810 media_delegate_.reset(); |
| 810 | 811 |
| 811 keyboard::KeyboardController::ResetInstance(NULL); | 812 keyboard::KeyboardController::ResetInstance(NULL); |
| 812 | 813 |
| 813 #if defined(OS_CHROMEOS) | 814 #if defined(OS_CHROMEOS) |
| 815 display_color_manager_.reset(); |
| 814 if (display_change_observer_) | 816 if (display_change_observer_) |
| 815 display_configurator_->RemoveObserver(display_change_observer_.get()); | 817 display_configurator_->RemoveObserver(display_change_observer_.get()); |
| 816 if (display_configurator_animation_) | 818 if (display_configurator_animation_) |
| 817 display_configurator_->RemoveObserver( | 819 display_configurator_->RemoveObserver( |
| 818 display_configurator_animation_.get()); | 820 display_configurator_animation_.get()); |
| 819 if (display_error_observer_) | 821 if (display_error_observer_) |
| 820 display_configurator_->RemoveObserver(display_error_observer_.get()); | 822 display_configurator_->RemoveObserver(display_error_observer_.get()); |
| 821 if (projecting_observer_) { | 823 if (projecting_observer_) { |
| 822 display_configurator_->RemoveObserver(projecting_observer_.get()); | 824 display_configurator_->RemoveObserver(projecting_observer_.get()); |
| 823 RemoveShellObserver(projecting_observer_.get()); | 825 RemoveShellObserver(projecting_observer_.get()); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 // observer gets invoked after the root windows are configured. | 858 // observer gets invoked after the root windows are configured. |
| 857 display_configurator_->AddObserver(display_change_observer_.get()); | 859 display_configurator_->AddObserver(display_change_observer_.get()); |
| 858 display_error_observer_.reset(new DisplayErrorObserver()); | 860 display_error_observer_.reset(new DisplayErrorObserver()); |
| 859 display_configurator_->AddObserver(display_error_observer_.get()); | 861 display_configurator_->AddObserver(display_error_observer_.get()); |
| 860 display_configurator_->set_state_controller(display_change_observer_.get()); | 862 display_configurator_->set_state_controller(display_change_observer_.get()); |
| 861 display_configurator_->set_mirroring_controller(display_manager_.get()); | 863 display_configurator_->set_mirroring_controller(display_manager_.get()); |
| 862 display_configurator_->ForceInitialConfigure( | 864 display_configurator_->ForceInitialConfigure( |
| 863 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); | 865 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); |
| 864 display_initialized = true; | 866 display_initialized = true; |
| 865 } | 867 } |
| 868 display_color_manager_.reset( |
| 869 new DisplayColorManager(display_configurator_.get())); |
| 866 #endif // defined(OS_CHROMEOS) | 870 #endif // defined(OS_CHROMEOS) |
| 867 if (!display_initialized) | 871 if (!display_initialized) |
| 868 display_manager_->InitDefaultDisplay(); | 872 display_manager_->InitDefaultDisplay(); |
| 869 | 873 |
| 870 display_manager_->RefreshFontParams(); | 874 display_manager_->RefreshFontParams(); |
| 871 | 875 |
| 872 // Install the custom factory first so that views::FocusManagers for Tray, | 876 // Install the custom factory first so that views::FocusManagers for Tray, |
| 873 // Shelf, and WallPaper could be created by the factory. | 877 // Shelf, and WallPaper could be created by the factory. |
| 874 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 878 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
| 875 | 879 |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 //////////////////////////////////////////////////////////////////////////////// | 1177 //////////////////////////////////////////////////////////////////////////////// |
| 1174 // Shell, aura::client::ActivationChangeObserver implementation: | 1178 // Shell, aura::client::ActivationChangeObserver implementation: |
| 1175 | 1179 |
| 1176 void Shell::OnWindowActivated(aura::Window* gained_active, | 1180 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 1177 aura::Window* lost_active) { | 1181 aura::Window* lost_active) { |
| 1178 if (gained_active) | 1182 if (gained_active) |
| 1179 target_root_window_ = gained_active->GetRootWindow(); | 1183 target_root_window_ = gained_active->GetRootWindow(); |
| 1180 } | 1184 } |
| 1181 | 1185 |
| 1182 } // namespace ash | 1186 } // namespace ash |
| OLD | NEW |