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

Side by Side Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 288033019: ozone: Fix egltest platform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 "ui/ozone/platform/egltest/ozone_platform_egltest.h" 5 #include "ui/ozone/platform/egltest/ozone_platform_egltest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 virtual void InitializeUI() OVERRIDE { 258 virtual void InitializeUI() OVERRIDE {
259 device_manager_ = CreateDeviceManager(); 259 device_manager_ = CreateDeviceManager();
260 surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_)); 260 surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_));
261 event_factory_ozone_.reset( 261 event_factory_ozone_.reset(
262 new EventFactoryEvdev(NULL, device_manager_.get())); 262 new EventFactoryEvdev(NULL, device_manager_.get()));
263 input_method_context_factory_ozone_.reset( 263 input_method_context_factory_ozone_.reset(
264 new InputMethodContextFactoryOzone()); 264 new InputMethodContextFactoryOzone());
265 cursor_factory_ozone_.reset(new CursorFactoryOzone()); 265 cursor_factory_ozone_.reset(new CursorFactoryOzone());
266 } 266 }
267 267
268 virtual void InitializeGPU() OVERRIDE {} 268 virtual void InitializeGPU() OVERRIDE {
269 surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_));
270 }
269 271
270 private: 272 private:
271 LibeglplatformShimLoader eglplatform_shim_; 273 LibeglplatformShimLoader eglplatform_shim_;
272 scoped_ptr<DeviceManager> device_manager_; 274 scoped_ptr<DeviceManager> device_manager_;
273 scoped_ptr<SurfaceFactoryEgltest> surface_factory_ozone_; 275 scoped_ptr<SurfaceFactoryEgltest> surface_factory_ozone_;
274 scoped_ptr<EventFactoryEvdev> event_factory_ozone_; 276 scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
275 scoped_ptr<InputMethodContextFactoryOzone> 277 scoped_ptr<InputMethodContextFactoryOzone>
276 input_method_context_factory_ozone_; 278 input_method_context_factory_ozone_;
277 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; 279 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
278 280
279 bool shim_initialized_; 281 bool shim_initialized_;
280 282
281 DISALLOW_COPY_AND_ASSIGN(OzonePlatformEgltest); 283 DISALLOW_COPY_AND_ASSIGN(OzonePlatformEgltest);
282 }; 284 };
283 285
284 } // namespace 286 } // namespace
285 287
286 OzonePlatform* CreateOzonePlatformEgltest() { 288 OzonePlatform* CreateOzonePlatformEgltest() {
287 OzonePlatformEgltest* platform = new OzonePlatformEgltest; 289 OzonePlatformEgltest* platform = new OzonePlatformEgltest;
288 platform->Initialize(); 290 platform->Initialize();
289 return platform; 291 return platform;
290 } 292 }
291 293
292 } // namespace ui 294 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698