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