| 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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 display_error_observer_.reset(new DisplayErrorObserver()); | 858 display_error_observer_.reset(new DisplayErrorObserver()); |
| 859 display_configurator_->AddObserver(display_error_observer_.get()); | 859 display_configurator_->AddObserver(display_error_observer_.get()); |
| 860 display_configurator_->set_state_controller(display_change_observer_.get()); | 860 display_configurator_->set_state_controller(display_change_observer_.get()); |
| 861 display_configurator_->set_mirroring_controller(display_manager_.get()); | 861 display_configurator_->set_mirroring_controller(display_manager_.get()); |
| 862 display_configurator_->ForceInitialConfigure( | 862 display_configurator_->ForceInitialConfigure( |
| 863 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); | 863 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); |
| 864 display_initialized = true; | 864 display_initialized = true; |
| 865 } | 865 } |
| 866 display_color_manager_.reset( | 866 display_color_manager_.reset( |
| 867 new DisplayColorManager(display_configurator_.get(), blocking_pool_)); | 867 new DisplayColorManager(display_configurator_.get(), blocking_pool_)); |
| 868 |
| 869 // TODO: Delete! (Only here for testing) |
| 870 display_color_manager_->LoadCalibrationForDisplayQuirksTest(); |
| 868 #endif // defined(OS_CHROMEOS) | 871 #endif // defined(OS_CHROMEOS) |
| 869 if (!display_initialized) | 872 if (!display_initialized) |
| 870 display_manager_->InitDefaultDisplay(); | 873 display_manager_->InitDefaultDisplay(); |
| 871 | 874 |
| 872 display_manager_->RefreshFontParams(); | 875 display_manager_->RefreshFontParams(); |
| 873 | 876 |
| 874 // Install the custom factory first so that views::FocusManagers for Tray, | 877 // Install the custom factory first so that views::FocusManagers for Tray, |
| 875 // Shelf, and WallPaper could be created by the factory. | 878 // Shelf, and WallPaper could be created by the factory. |
| 876 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 879 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
| 877 | 880 |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1171 | 1174 |
| 1172 void Shell::OnWindowActivated( | 1175 void Shell::OnWindowActivated( |
| 1173 aura::client::ActivationChangeObserver::ActivationReason reason, | 1176 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1174 aura::Window* gained_active, | 1177 aura::Window* gained_active, |
| 1175 aura::Window* lost_active) { | 1178 aura::Window* lost_active) { |
| 1176 if (gained_active) | 1179 if (gained_active) |
| 1177 target_root_window_ = gained_active->GetRootWindow(); | 1180 target_root_window_ = gained_active->GetRootWindow(); |
| 1178 } | 1181 } |
| 1179 | 1182 |
| 1180 } // namespace ash | 1183 } // namespace ash |
| OLD | NEW |