OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/mus/window_manager_application.h" | 5 #include "ash/mus/window_manager_application.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 // binary to get system data, which we don't want to do twice on startup. | 117 // binary to get system data, which we don't want to do twice on startup. |
118 statistics_provider_.reset( | 118 statistics_provider_.reset( |
119 new chromeos::system::ScopedFakeStatisticsProvider()); | 119 new chromeos::system::ScopedFakeStatisticsProvider()); |
120 statistics_provider_->SetMachineStatistic("initial_locale", "en-US"); | 120 statistics_provider_->SetMachineStatistic("initial_locale", "en-US"); |
121 statistics_provider_->SetMachineStatistic("keyboard_layout", ""); | 121 statistics_provider_->SetMachineStatistic("keyboard_layout", ""); |
122 #endif | 122 #endif |
123 window_manager_->Init(std::move(window_tree_client), blocking_pool); | 123 window_manager_->Init(std::move(window_tree_client), blocking_pool); |
124 } | 124 } |
125 | 125 |
126 void WindowManagerApplication::OnStart(const shell::Identity& identity) { | 126 void WindowManagerApplication::OnStart(const shell::Identity& identity) { |
127 aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak")); | 127 aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak", |
| 128 "ash_mus_resources_200.pak")); |
128 gpu_service_ = ui::GpuService::Create(connector()); | 129 gpu_service_ = ui::GpuService::Create(connector()); |
129 compositor_context_factory_.reset( | 130 compositor_context_factory_.reset( |
130 new views::SurfaceContextFactory(gpu_service_.get())); | 131 new views::SurfaceContextFactory(gpu_service_.get())); |
131 aura::Env::GetInstance()->set_context_factory( | 132 aura::Env::GetInstance()->set_context_factory( |
132 compositor_context_factory_.get()); | 133 compositor_context_factory_.get()); |
133 window_manager_.reset(new WindowManager(connector())); | 134 window_manager_.reset(new WindowManager(connector())); |
134 | 135 |
135 MaterialDesignController::Initialize(); | 136 MaterialDesignController::Initialize(); |
136 | 137 |
137 tracing_.Initialize(connector(), identity.name()); | 138 tracing_.Initialize(connector(), identity.name()); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, | 209 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, |
209 base::Unretained(this)))); | 210 base::Unretained(this)))); |
210 } | 211 } |
211 | 212 |
212 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { | 213 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { |
213 window_manager_->SetScreenLocked(locked); | 214 window_manager_->SetScreenLocked(locked); |
214 } | 215 } |
215 | 216 |
216 } // namespace mus | 217 } // namespace mus |
217 } // namespace ash | 218 } // namespace ash |
OLD | NEW |