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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 display_configurator_->set_state_controller(display_change_observer_.get()); | 845 display_configurator_->set_state_controller(display_change_observer_.get()); |
846 display_configurator_->set_mirroring_controller(display_manager_.get()); | 846 display_configurator_->set_mirroring_controller(display_manager_.get()); |
847 display_configurator_->ForceInitialConfigure( | 847 display_configurator_->ForceInitialConfigure( |
848 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); | 848 delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0); |
849 display_initialized = true; | 849 display_initialized = true; |
850 } | 850 } |
851 #endif // defined(OS_CHROMEOS) | 851 #endif // defined(OS_CHROMEOS) |
852 if (!display_initialized) | 852 if (!display_initialized) |
853 display_manager_->InitDefaultDisplay(); | 853 display_manager_->InitDefaultDisplay(); |
854 | 854 |
| 855 display_manager_->InitFontParams(); |
| 856 |
855 // Install the custom factory first so that views::FocusManagers for Tray, | 857 // Install the custom factory first so that views::FocusManagers for Tray, |
856 // Shelf, and WallPaper could be created by the factory. | 858 // Shelf, and WallPaper could be created by the factory. |
857 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 859 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
858 | 860 |
859 aura::Env::CreateInstance(true); | 861 aura::Env::CreateInstance(true); |
860 aura::Env::GetInstance()->set_context_factory(init_params.context_factory); | 862 aura::Env::GetInstance()->set_context_factory(init_params.context_factory); |
861 | 863 |
862 // The WindowModalityController needs to be at the front of the input event | 864 // The WindowModalityController needs to be at the front of the input event |
863 // pretarget handler list to ensure that it processes input events when modal | 865 // pretarget handler list to ensure that it processes input events when modal |
864 // windows are active. | 866 // windows are active. |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1151 //////////////////////////////////////////////////////////////////////////////// | 1153 //////////////////////////////////////////////////////////////////////////////// |
1152 // Shell, aura::client::ActivationChangeObserver implementation: | 1154 // Shell, aura::client::ActivationChangeObserver implementation: |
1153 | 1155 |
1154 void Shell::OnWindowActivated(aura::Window* gained_active, | 1156 void Shell::OnWindowActivated(aura::Window* gained_active, |
1155 aura::Window* lost_active) { | 1157 aura::Window* lost_active) { |
1156 if (gained_active) | 1158 if (gained_active) |
1157 target_root_window_ = gained_active->GetRootWindow(); | 1159 target_root_window_ = gained_active->GetRootWindow(); |
1158 } | 1160 } |
1159 | 1161 |
1160 } // namespace ash | 1162 } // namespace ash |
OLD | NEW |