Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: services/ui/service.cc

Issue 2156093004: Use mojo for cursor control in ozone drm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 InitializeResources(connector); 173 InitializeResources(connector);
174 174
175 #if defined(USE_OZONE) 175 #if defined(USE_OZONE)
176 // The ozone platform can provide its own event source. So initialize the 176 // The ozone platform can provide its own event source. So initialize the
177 // platform before creating the default event source. 177 // platform before creating the default event source.
178 // Because GL libraries need to be initialized before entering the sandbox, 178 // Because GL libraries need to be initialized before entering the sandbox,
179 // in MUS, |InitializeForUI| will load the GL libraries. 179 // in MUS, |InitializeForUI| will load the GL libraries.
180 ui::OzonePlatform::InitParams params; 180 ui::OzonePlatform::InitParams params;
181 params.connector = connector; 181 params.connector = connector;
182 params.single_process = false; 182 params.single_process = false;
183
184 ui::OzonePlatform::InitializeForUI(params); 183 ui::OzonePlatform::InitializeForUI(params);
185 184
186 // TODO(kylechar): We might not always want a US keyboard layout. 185 // TODO(kylechar): We might not always want a US keyboard layout.
187 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() 186 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()
188 ->SetCurrentLayoutByName("us"); 187 ->SetCurrentLayoutByName("us");
189 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); 188 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
190 ui::ClientNativePixmapFactory::SetInstance( 189 ui::ClientNativePixmapFactory::SetInstance(
191 client_native_pixmap_factory_.get()); 190 client_native_pixmap_factory_.get());
192 191
193 DCHECK(ui::ClientNativePixmapFactory::GetInstance()); 192 DCHECK(ui::ClientNativePixmapFactory::GetInstance());
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 // Display manages its own lifetime. 393 // Display manages its own lifetime.
395 ws::Display* host_impl = 394 ws::Display* host_impl =
396 new ws::Display(window_server_.get(), platform_display_init_params_); 395 new ws::Display(window_server_.get(), platform_display_init_params_);
397 host_impl->Init(nullptr); 396 host_impl->Init(nullptr);
398 397
399 if (touch_controller_) 398 if (touch_controller_)
400 touch_controller_->UpdateTouchTransforms(); 399 touch_controller_->UpdateTouchTransforms();
401 } 400 }
402 401
403 } // namespace ui 402 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698