OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/ui/service.h" | 5 #include "services/ui/service.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 InitializeResources(connector()); | 149 InitializeResources(connector()); |
150 | 150 |
151 #if defined(USE_OZONE) | 151 #if defined(USE_OZONE) |
152 // The ozone platform can provide its own event source. So initialize the | 152 // The ozone platform can provide its own event source. So initialize the |
153 // platform before creating the default event source. | 153 // platform before creating the default event source. |
154 // Because GL libraries need to be initialized before entering the sandbox, | 154 // Because GL libraries need to be initialized before entering the sandbox, |
155 // in MUS, |InitializeForUI| will load the GL libraries. | 155 // in MUS, |InitializeForUI| will load the GL libraries. |
156 ui::OzonePlatform::InitParams params; | 156 ui::OzonePlatform::InitParams params; |
157 params.connector = connector(); | 157 params.connector = connector(); |
158 params.single_process = false; | 158 params.single_process = false; |
159 | |
160 ui::OzonePlatform::InitializeForUI(params); | 159 ui::OzonePlatform::InitializeForUI(params); |
161 | 160 |
162 // TODO(kylechar): We might not always want a US keyboard layout. | 161 // TODO(kylechar): We might not always want a US keyboard layout. |
163 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() | 162 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() |
164 ->SetCurrentLayoutByName("us"); | 163 ->SetCurrentLayoutByName("us"); |
165 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); | 164 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); |
166 ui::ClientNativePixmapFactory::SetInstance( | 165 ui::ClientNativePixmapFactory::SetInstance( |
167 client_native_pixmap_factory_.get()); | 166 client_native_pixmap_factory_.get()); |
168 | 167 |
169 DCHECK(ui::ClientNativePixmapFactory::GetInstance()); | 168 DCHECK(ui::ClientNativePixmapFactory::GetInstance()); |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 // Display manages its own lifetime. | 346 // Display manages its own lifetime. |
348 ws::Display* host_impl = | 347 ws::Display* host_impl = |
349 new ws::Display(window_server_.get(), platform_display_init_params_); | 348 new ws::Display(window_server_.get(), platform_display_init_params_); |
350 host_impl->Init(nullptr); | 349 host_impl->Init(nullptr); |
351 | 350 |
352 if (touch_controller_) | 351 if (touch_controller_) |
353 touch_controller_->UpdateTouchTransforms(); | 352 touch_controller_->UpdateTouchTransforms(); |
354 } | 353 } |
355 | 354 |
356 } // namespace ui | 355 } // namespace ui |
OLD | NEW |