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

Unified Diff: ui/ozone/platform/dri/ozone_platform_dri.cc

Issue 325873002: [Ozone DRI] Add support to configure the VT on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/dri/dri.gypi ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index 442b4857917dbc52b0a94ee24096791bd261bbf4..4d77c35129d244669c7abd82e74952b60a42abcf 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -4,6 +4,7 @@
#include "ui/ozone/platform/dri/ozone_platform_dri.h"
+#include "base/at_exit.h"
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ -14,6 +15,7 @@
#include "ui/ozone/platform/dri/dri_wrapper.h"
#include "ui/ozone/platform/dri/scanout_surface.h"
#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/dri/virtual_terminal_manager.h"
#if defined(OS_CHROMEOS)
#include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"
@@ -48,11 +50,15 @@ class DriSurfaceGenerator : public ScanoutSurfaceGenerator {
class OzonePlatformDri : public OzonePlatform {
public:
OzonePlatformDri()
- : dri_(new DriWrapper(kDefaultGraphicsCardPath)),
+ : vt_manager_(new VirtualTerminalManager()),
+ dri_(new DriWrapper(kDefaultGraphicsCardPath)),
surface_generator_(new DriSurfaceGenerator(dri_.get())),
screen_manager_(new ScreenManager(dri_.get(),
surface_generator_.get())),
- device_manager_(CreateDeviceManager()) {}
+ device_manager_(CreateDeviceManager()) {
+ base::AtExitManager::RegisterTask(
+ base::Bind(&base::DeletePointer<OzonePlatformDri>, this));
+ }
virtual ~OzonePlatformDri() {}
// OzonePlatform:
@@ -89,9 +95,9 @@ class OzonePlatformDri : public OzonePlatform {
virtual void InitializeGPU() OVERRIDE {}
private:
+ scoped_ptr<VirtualTerminalManager> vt_manager_;
scoped_ptr<DriWrapper> dri_;
scoped_ptr<DriSurfaceGenerator> surface_generator_;
- // TODO(dnicoara) Move ownership of |screen_manager_| to NDD.
scoped_ptr<ScreenManager> screen_manager_;
scoped_ptr<DeviceManager> device_manager_;
« no previous file with comments | « ui/ozone/platform/dri/dri.gypi ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698