← Back to branch summary

~osomon/oxide/ensure-files-exist

« back to all changes in this revision

Viewing changes to shared/ozone/oxide_ozone_platform.cc

  • Committer: Olivier Tilloy
  • Date: 2014-09-25 16:27:09 UTC
  • mfrom: (677.1.95 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20140925162709-h8bai0f1nfaf7cfy
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/ozone/oxide_ozone_platform.cc
19
19
#include "base/compiler_specific.h"
20
20
#include "base/logging.h"
21
21
#include "base/memory/scoped_ptr.h"
22
 
#include "ui/ozone/public/event_factory_ozone.h"
23
22
#include "ui/ozone/public/gpu_platform_support.h"
24
23
#include "ui/ozone/public/gpu_platform_support_host.h"
25
24
#include "ui/ozone/public/ozone_platform.h"
41
40
    return &surface_factory_;
42
41
  }
43
42
 
44
 
  ui::EventFactoryOzone* GetEventFactoryOzone() FINAL {
45
 
    return &event_factory_;
46
 
  }
47
 
 
48
43
  ui::CursorFactoryOzone* GetCursorFactoryOzone() FINAL {
49
44
    return NULL;
50
45
  }
68
63
  void InitializeGPU() OVERRIDE {}
69
64
 
70
65
  OzoneSurfaceFactory surface_factory_;
71
 
  ui::EventFactoryOzone event_factory_;
72
66
  scoped_ptr<ui::GpuPlatformSupportHost> gpu_platform_support_host_;
73
67
  scoped_ptr<ui::GpuPlatformSupport> gpu_platform_support_;
74
68
};