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

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

Issue 2705333006: Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx (Closed)
Patch Set: Fix trace Created 3 years, 9 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
« no previous file with comments | « services/ui/service.h ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // Because GL libraries need to be initialized before entering the sandbox, 163 // Because GL libraries need to be initialized before entering the sandbox,
164 // in MUS, |InitializeForUI| will load the GL libraries. 164 // in MUS, |InitializeForUI| will load the GL libraries.
165 ui::OzonePlatform::InitParams params; 165 ui::OzonePlatform::InitParams params;
166 params.connector = context()->connector(); 166 params.connector = context()->connector();
167 params.single_process = false; 167 params.single_process = false;
168 ui::OzonePlatform::InitializeForUI(params); 168 ui::OzonePlatform::InitializeForUI(params);
169 169
170 // TODO(kylechar): We might not always want a US keyboard layout. 170 // TODO(kylechar): We might not always want a US keyboard layout.
171 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine() 171 ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()
172 ->SetCurrentLayoutByName("us"); 172 ->SetCurrentLayoutByName("us");
173 client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create(); 173 client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
174 ui::ClientNativePixmapFactory::SetInstance( 174 ui::ClientNativePixmapFactory::SetInstance(
175 client_native_pixmap_factory_.get()); 175 client_native_pixmap_factory_.get());
176 176
177 DCHECK(ui::ClientNativePixmapFactory::GetInstance()); 177 DCHECK(ui::ClientNativePixmapFactory::GetInstance());
178 #endif 178 #endif
179 179
180 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState 180 // TODO(rjkroege): Enter sandbox here before we start threads in GpuState
181 // http://crbug.com/584532 181 // http://crbug.com/584532
182 182
183 #if !defined(OS_ANDROID) 183 #if !defined(OS_ANDROID)
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 mojom::WindowServerTestRequest request) { 365 mojom::WindowServerTestRequest request) {
366 if (!test_config_) 366 if (!test_config_)
367 return; 367 return;
368 mojo::MakeStrongBinding( 368 mojo::MakeStrongBinding(
369 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), 369 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
370 std::move(request)); 370 std::move(request));
371 } 371 }
372 372
373 373
374 } // namespace ui 374 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/service.h ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698