[Ozone] Rename and split the DRI platform for clarity

This CL does the following:
 - Moves the files in ui/ozone/platform/dri to ui/ozone/platform/drm
   since the platform name should really be DRM rather than DRI. Note,
   that the platform is still refered to as "dri" in GYP/GN since CrOS
   builds are still using the 'dri' name.
 - Rename all files with a "_dri*" suffix to a "drm_" prefix. Also
   rename all files with a "dri_" prefix to a "drm_" prefix.
 - Rename NativeDisplayDelegateDri to DrmDisplayDelegateManager since it
   is no longer dependent on the NativeDisplayDelegate interface and the
   new name better describes its intent.
 - Split the files in the platform into 2 sub-folders ("host" and
   "gpu"). Depending on the intended use place of the objects (Browser
   (host) process or GPU process) the files in the platform are split
   accordingly in the 2 sub-folders.

BUG=none
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/975063002

Cr-Commit-Position: refs/heads/master@{#319320}

98 files changed, 1365 insertions, 1376 deletions

diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index f3618a1..2fbc1f3 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -31,13 +31,13 @@ if (ozone_platform_caca) {
 
 if (ozone_platform_dri) {
   ozone_platforms += [ "dri" ]
-  ozone_platform_deps += [ "platform/dri" ]
-  ozone_platform_test_deps += [ "platform/dri:dri_unittests" ]
+  ozone_platform_deps += [ "platform/drm" ]
+  ozone_platform_test_deps += [ "platform/drm:drm_unittests" ]
 }
 
 if (ozone_platform_gbm) {
   ozone_platforms += [ "gbm" ]
-  ozone_platform_deps += [ "platform/dri:gbm" ]
+  ozone_platform_deps += [ "platform/drm:gbm" ]
 }
 
 platform_list_cc_file = "$target_gen_dir/platform_list.cc"
diff --git a/ui/ozone/ozone.gyp b/ui/ozone/ozone.gyp
index 429a15b..346b3db 100644
--- a/ui/ozone/ozone.gyp
+++ b/ui/ozone/ozone.gyp
@@ -198,7 +198,7 @@
     }],
     ['<(ozone_platform_dri) == 1 or <(ozone_platform_gbm) == 1', {
       'includes': [
-        'platform/dri/dri.gypi',
+        'platform/drm/drm.gypi',
       ],
     }],
     ['<(ozone_platform_egltest) == 1', {
@@ -208,7 +208,7 @@
     }],
     ['<(ozone_platform_gbm) == 1', {
       'includes': [
-        'platform/dri/gbm.gypi',
+        'platform/drm/gbm.gypi',
       ],
     }],
     ['<(ozone_platform_test) == 1', {
diff --git a/ui/ozone/platform/dri/BUILD.gn b/ui/ozone/platform/dri/BUILD.gn
deleted file mode 100644
index 03112a3..0000000
--- a/ui/ozone/platform/dri/BUILD.gn
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/linux/pkg_config.gni")
-import("//ui/ozone/ozone.gni")
-
-declare_args() {
-  use_mesa_platform_null = false
-}
-
-pkg_config("libdrm") {
-  packages = [ "libdrm" ]
-}
-
-source_set("dri_common") {
-  sources = [
-    "channel_observer.h",
-    "crtc_controller.cc",
-    "crtc_controller.h",
-    "display_change_observer.h",
-    "display_manager.cc",
-    "display_manager.h",
-    "display_mode_dri.cc",
-    "display_mode_dri.h",
-    "display_snapshot_dri.cc",
-    "display_snapshot_dri.h",
-    "dri_buffer.cc",
-    "dri_buffer.h",
-    "dri_console_buffer.cc",
-    "dri_console_buffer.h",
-    "dri_cursor.cc",
-    "dri_cursor.h",
-    "dri_gpu_platform_support.cc",
-    "dri_gpu_platform_support_.h",
-    "dri_gpu_platform_support_host.cc",
-    "dri_gpu_platform_support_host.h",
-    "dri_surface.cc",
-    "dri_surface.h",
-    "dri_surface_factory.cc",
-    "dri_surface_factory.h",
-    "dri_util.cc",
-    "dri_util.h",
-    "dri_vsync_provider.cc",
-    "dri_vsync_provider.h",
-    "dri_window.cc",
-    "dri_window.h",
-    "dri_window_delegate.cc",
-    "dri_window_delegate.h",
-    "dri_window_delegate_manager.cc",
-    "dri_window_delegate_manager.h",
-    "dri_window_manager.cc",
-    "dri_window_manager.h",
-    "drm_device.cc",
-    "drm_device.h",
-    "drm_device_generator.cc",
-    "drm_device_generator.h",
-    "drm_device_manager.cc",
-    "drm_device_manager.h",
-    "hardware_display_controller.cc",
-    "hardware_display_controller.h",
-    "hardware_display_plane.cc",
-    "hardware_display_plane.h",
-    "hardware_display_plane_manager.cc",
-    "hardware_display_plane_manager.h",
-    "hardware_display_plane_manager_legacy.cc",
-    "hardware_display_plane_manager_legacy.h",
-    "native_display_delegate_dri.cc",
-    "native_display_delegate_dri.h",
-    "native_display_delegate_proxy.cc",
-    "native_display_delegate_proxy.h",
-    "overlay_plane.cc",
-    "overlay_plane.h",
-    "scanout_buffer.h",
-    "scoped_drm_types.cc",
-    "scoped_drm_types.h",
-    "screen_manager.cc",
-    "screen_manager.h",
-  ]
-
-  defines = [ "OZONE_IMPLEMENTATION" ]
-
-  deps = [
-    "//base",
-    "//skia",
-    "//ipc",
-    "//ui/base",
-    "//ui/display/types",
-    "//ui/display/util",
-    "//ui/events",
-    "//ui/events/devices",
-    "//ui/events/ozone:events_ozone_evdev",
-    "//ui/events/ozone:events_ozone_layout",
-    "//ui/events/platform",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-
-  public_configs = [ ":libdrm" ]
-}
-
-if (ozone_platform_dri) {
-  source_set("dri") {
-    sources = [
-      "ozone_platform_dri.cc",
-      "ozone_platform_dri.h",
-    ]
-
-    deps = [
-      ":dri_common",
-      "//base",
-      "//skia",
-      "//ui/events/ozone:events_ozone_evdev",
-      "//ui/events/ozone:events_ozone_layout",
-    ]
-  }
-
-  source_set("dri_unittests") {
-    testonly = true
-    sources = [
-      "dri_surface_unittest.cc",
-      "dri_window_delegate_unittest.cc",
-      "hardware_display_controller_unittest.cc",
-      "hardware_display_plane_manager_unittest.cc",
-      "screen_manager_unittest.cc",
-      "test/mock_dri_wrapper.cc",
-      "test/mock_dri_wrapper.h",
-    ]
-
-    deps = [
-      "//skia",
-      "//testing/gtest",
-      "//ui/ozone",
-    ]
-
-    public_configs = [ ":libdrm" ]
-  }
-}
-
-if (ozone_platform_gbm) {
-  pkg_config("libgbm") {
-    packages = [ "gbm" ]
-  }
-
-  source_set("gbm") {
-    sources = [
-      "gbm_buffer.cc",
-      "gbm_buffer.h",
-      "gbm_buffer_base.cc",
-      "gbm_buffer_base.h",
-      "gbm_device.cc",
-      "gbm_device.h",
-      "gbm_surface.cc",
-      "gbm_surface.h",
-      "gbm_surface_factory.cc",
-      "gbm_surface_factory.h",
-      "gbm_surfaceless.cc",
-      "gbm_surfaceless.h",
-      "ozone_platform_gbm.cc",
-      "ozone_platform_gbm.h",
-    ]
-
-    deps = [
-      ":dri_common",
-      "//base",
-      "//skia",
-      "//ui/events/ozone:events_ozone_evdev",
-      "//ui/events/ozone:events_ozone_layout",
-    ]
-
-    public_configs = [ ":libgbm" ]
-
-    if (use_mesa_platform_null) {
-      defines += [ "USE_MESA_PLATFORM_NULL" ]
-    }
-  }
-}
diff --git a/ui/ozone/platform/dri/dri.gypi b/ui/ozone/platform/dri/dri.gypi
deleted file mode 100644
index 63faee7..0000000
--- a/ui/ozone/platform/dri/dri.gypi
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'internal_ozone_platform_deps': [
-      'ozone_platform_dri',
-    ],
-    'internal_ozone_platform_unittest_deps': [
-      'ozone_platform_dri_unittests',
-    ],
-    'internal_ozone_platforms': [
-      'dri',
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'ozone_platform_dri',
-      'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../build/linux/system.gyp:libdrm',
-        '../../skia/skia.gyp:skia',
-        '../base/ui_base.gyp:ui_base',
-        '../display/display.gyp:display_types',
-        '../display/display.gyp:display_util',
-        '../events/devices/events_devices.gyp:events_devices',
-        '../events/events.gyp:events',
-        '../events/ozone/events_ozone.gyp:events_ozone_evdev',
-        '../events/ozone/events_ozone.gyp:events_ozone_layout',
-        '../events/platform/events_platform.gyp:events_platform',
-        '../gfx/gfx.gyp:gfx',
-        '../gfx/gfx.gyp:gfx_geometry',
-      ],
-      'defines': [
-        'OZONE_IMPLEMENTATION',
-      ],
-      'sources': [
-        'channel_observer.h',
-        'crtc_controller.cc',
-        'crtc_controller.h',
-        'display_change_observer.h',
-        'display_manager.cc',
-        'display_manager.h',
-        'display_mode_dri.cc',
-        'display_mode_dri.h',
-        'display_snapshot_dri.cc',
-        'display_snapshot_dri.h',
-        'dri_buffer.cc',
-        'dri_buffer.h',
-        'dri_console_buffer.cc',
-        'dri_console_buffer.h',
-        'dri_cursor.cc',
-        'dri_cursor.h',
-        'dri_gpu_platform_support.cc',
-        'dri_gpu_platform_support.h',
-        'dri_gpu_platform_support_host.cc',
-        'dri_gpu_platform_support_host.h',
-        'dri_surface.cc',
-        'dri_surface.h',
-        'dri_surface_factory.cc',
-        'dri_surface_factory.h',
-        'dri_util.cc',
-        'dri_util.h',
-        'dri_vsync_provider.cc',
-        'dri_vsync_provider.h',
-        'dri_window.cc',
-        'dri_window.h',
-        'dri_window_delegate.cc',
-        'dri_window_delegate.h',
-        'dri_window_delegate_manager.cc',
-        'dri_window_delegate_manager.h',
-        'dri_window_manager.cc',
-        'dri_window_manager.h',
-        'drm_device.cc',
-        'drm_device.h',
-        'drm_device_generator.cc',
-        'drm_device_generator.h',
-        'drm_device_manager.cc',
-        'drm_device_manager.h',
-        'hardware_display_controller.cc',
-        'hardware_display_controller.h',
-        'hardware_display_plane.cc',
-        'hardware_display_plane.h',
-        'hardware_display_plane_manager.cc',
-        'hardware_display_plane_manager.h',
-        'hardware_display_plane_manager_legacy.cc',
-        'hardware_display_plane_manager_legacy.h',
-        'native_display_delegate_dri.cc',
-        'native_display_delegate_dri.h',
-        'native_display_delegate_proxy.cc',
-        'native_display_delegate_proxy.h',
-        'overlay_plane.cc',
-        'overlay_plane.h',
-        'ozone_platform_dri.cc',
-        'ozone_platform_dri.h',
-        'scanout_buffer.h',
-        'scoped_drm_types.cc',
-        'scoped_drm_types.h',
-        'screen_manager.cc',
-        'screen_manager.h',
-      ],
-    },
-    {
-      'target_name': 'ozone_platform_dri_unittests',
-      'type': 'none',
-      'dependencies': [
-        '../../build/linux/system.gyp:libdrm',
-        '../../skia/skia.gyp:skia',
-        '../gfx/gfx.gyp:gfx_geometry',
-        'ozone.gyp:ozone',
-      ],
-      'export_dependent_settings': [
-        '../../build/linux/system.gyp:libdrm',
-        '../../skia/skia.gyp:skia',
-        '../gfx/gfx.gyp:gfx_geometry',
-      ],
-      'direct_dependent_settings': {
-        'sources': [
-          'dri_surface_unittest.cc',
-          'dri_window_delegate_unittest.cc',
-          'hardware_display_controller_unittest.cc',
-          'hardware_display_plane_manager_unittest.cc',
-          'screen_manager_unittest.cc',
-          'test/mock_drm_device.cc',
-          'test/mock_drm_device.h',
-        ],
-      },
-    },
-  ],
-}
diff --git a/ui/ozone/platform/dri/dri_surface_factory.cc b/ui/ozone/platform/dri/dri_surface_factory.cc
deleted file mode 100644
index a721daf..0000000
--- a/ui/ozone/platform/dri/dri_surface_factory.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/ozone/platform/dri/dri_surface_factory.h"
-
-#include <errno.h>
-
-#include "ui/gfx/native_widget_types.h"
-#include "ui/ozone/platform/dri/dri_surface.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/public/surface_ozone_canvas.h"
-
-namespace ui {
-
-DriSurfaceFactory::DriSurfaceFactory(DriWindowDelegateManager* window_manager)
-    : window_manager_(window_manager) {
-}
-
-DriSurfaceFactory::~DriSurfaceFactory() {
-}
-
-scoped_ptr<ui::SurfaceOzoneCanvas> DriSurfaceFactory::CreateCanvasForWidget(
-    gfx::AcceleratedWidget widget) {
-  return make_scoped_ptr(
-      new DriSurface(window_manager_->GetWindowDelegate(widget)));
-}
-
-bool DriSurfaceFactory::LoadEGLGLES2Bindings(
-      AddGLLibraryCallback add_gl_library,
-      SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
-  return false;
-}
-
-}  // namespace ui
diff --git a/ui/ozone/platform/dri/dri_vsync_provider.h b/ui/ozone/platform/dri/dri_vsync_provider.h
deleted file mode 100644
index 7248c52..0000000
--- a/ui/ozone/platform/dri/dri_vsync_provider.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_OZONE_PLATFORM_IMPL_DRI_VSYNC_PROVIDER_H_
-#define UI_OZONE_PLATFORM_IMPL_DRI_VSYNC_PROVIDER_H_
-
-#include "ui/gfx/vsync_provider.h"
-
-namespace ui {
-
-class DriWindowDelegate;
-
-class DriVSyncProvider : public gfx::VSyncProvider {
- public:
-  DriVSyncProvider(DriWindowDelegate* window_delegate);
-  ~DriVSyncProvider() override;
-
-  void GetVSyncParameters(const UpdateVSyncCallback& callback) override;
-
- private:
-  DriWindowDelegate* window_delegate_;  // Not owned.
-
-  DISALLOW_COPY_AND_ASSIGN(DriVSyncProvider);
-};
-
-}  // namespace ui
-
-#endif  // UI_OZONE_PLATFORM_IMPL_DRI_VSYNC_PROVIDER_H_
diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn
new file mode 100644
index 0000000..60ef0ad
--- /dev/null
+++ b/ui/ozone/platform/drm/BUILD.gn
@@ -0,0 +1,177 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/linux/pkg_config.gni")
+import("//ui/ozone/ozone.gni")
+
+declare_args() {
+  use_mesa_platform_null = false
+}
+
+pkg_config("libdrm") {
+  packages = [ "libdrm" ]
+}
+
+source_set("drm_common") {
+  sources = [
+    "drm_surface_factory.cc",
+    "drm_surface_factory.h",
+    "gpu/crtc_controller.cc",
+    "gpu/crtc_controller.h",
+    "gpu/display_change_observer.h",
+    "gpu/drm_buffer.cc",
+    "gpu/drm_buffer.h",
+    "gpu/drm_console_buffer.cc",
+    "gpu/drm_console_buffer.h",
+    "gpu/drm_device.cc",
+    "gpu/drm_device.h",
+    "gpu/drm_device_generator.cc",
+    "gpu/drm_device_generator.h",
+    "gpu/drm_device_manager.cc",
+    "gpu/drm_device_manager.h",
+    "gpu/drm_display_mode.cc",
+    "gpu/drm_display_mode.h",
+    "gpu/drm_display_snapshot.cc",
+    "gpu/drm_display_snapshot.h",
+    "gpu/drm_gpu_display_manager.cc",
+    "gpu/drm_gpu_display_manager.h",
+    "gpu/drm_gpu_platform_support.cc",
+    "gpu/drm_gpu_platform_support.h",
+    "gpu/drm_surface.cc",
+    "gpu/drm_surface.h",
+    "gpu/drm_util.cc",
+    "gpu/drm_util.h",
+    "gpu/drm_vsync_provider.cc",
+    "gpu/drm_vsync_provider.h",
+    "gpu/drm_window.cc",
+    "gpu/drm_window.h",
+    "gpu/drm_window_manager.cc",
+    "gpu/drm_window_manager.h",
+    "gpu/hardware_display_controller.cc",
+    "gpu/hardware_display_controller.h",
+    "gpu/hardware_display_plane.cc",
+    "gpu/hardware_display_plane.h",
+    "gpu/hardware_display_plane_manager.cc",
+    "gpu/hardware_display_plane_manager.h",
+    "gpu/hardware_display_plane_manager_legacy.cc",
+    "gpu/hardware_display_plane_manager_legacy.h",
+    "gpu/overlay_plane.cc",
+    "gpu/overlay_plane.h",
+    "gpu/scanout_buffer.h",
+    "gpu/scoped_drm_types.cc",
+    "gpu/scoped_drm_types.h",
+    "gpu/screen_manager.cc",
+    "gpu/screen_manager.h",
+    "host/channel_observer.h",
+    "host/display_manager.cc",
+    "host/display_manager.h",
+    "host/drm_cursor.cc",
+    "host/drm_cursor.h",
+    "host/drm_gpu_platform_support_host.cc",
+    "host/drm_gpu_platform_support_host.h",
+    "host/drm_native_display_delegate.cc",
+    "host/drm_native_display_delegate.h",
+    "host/drm_window_host.cc",
+    "host/drm_window_host.h",
+    "host/drm_window_host_manager.cc",
+    "host/drm_window_host_manager.h",
+  ]
+
+  defines = [ "OZONE_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ipc",
+    "//ui/base",
+    "//ui/display/types",
+    "//ui/display/util",
+    "//ui/events",
+    "//ui/events/devices",
+    "//ui/events/ozone:events_ozone_evdev",
+    "//ui/events/ozone:events_ozone_layout",
+    "//ui/events/platform",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
+  public_configs = [ ":libdrm" ]
+}
+
+if (ozone_platform_dri) {
+  source_set("drm") {
+    sources = [
+      "ozone_platform_drm.cc",
+      "ozone_platform_drm.h",
+    ]
+
+    deps = [
+      ":drm_common",
+      "//base",
+      "//skia",
+      "//ui/events/ozone:events_ozone_evdev",
+      "//ui/events/ozone:events_ozone_layout",
+    ]
+  }
+
+  source_set("drm_unittests") {
+    testonly = true
+    sources = [
+      "gpu/drm_surface_unittest.cc",
+      "gpu/drm_window_unittest.cc",
+      "gpu/hardware_display_controller_unittest.cc",
+      "gpu/hardware_display_plane_manager_unittest.cc",
+      "gpu/screen_manager_unittest.cc",
+      "test/mock_drm_wrapper.cc",
+      "test/mock_drm_wrapper.h",
+    ]
+
+    deps = [
+      "//skia",
+      "//testing/gtest",
+      "//ui/ozone",
+    ]
+
+    public_configs = [ ":libdrm" ]
+  }
+}
+
+if (ozone_platform_gbm) {
+  pkg_config("libgbm") {
+    packages = [ "gbm" ]
+  }
+
+  source_set("gbm") {
+    sources = [
+      "gbm_surface_factory.cc",
+      "gbm_surface_factory.h",
+      "gpu/gbm_buffer.cc",
+      "gpu/gbm_buffer.h",
+      "gpu/gbm_buffer_base.cc",
+      "gpu/gbm_buffer_base.h",
+      "gpu/gbm_device.cc",
+      "gpu/gbm_device.h",
+      "gpu/gbm_surface.cc",
+      "gpu/gbm_surface.h",
+      "gpu/gbm_surfaceless.cc",
+      "gpu/gbm_surfaceless.h",
+      "ozone_platform_gbm.cc",
+      "ozone_platform_gbm.h",
+    ]
+
+    deps = [
+      ":drm_common",
+      "//base",
+      "//skia",
+      "//ui/events/ozone:events_ozone_evdev",
+      "//ui/events/ozone:events_ozone_layout",
+    ]
+
+    public_configs = [ ":libgbm" ]
+
+    if (use_mesa_platform_null) {
+      defines += [ "USE_MESA_PLATFORM_NULL" ]
+    }
+  }
+}
diff --git a/ui/ozone/platform/dri/DEPS b/ui/ozone/platform/drm/DEPS
index 0ab1471..0ab1471 100644
--- a/ui/ozone/platform/dri/DEPS
+++ b/ui/ozone/platform/drm/DEPS
diff --git a/ui/ozone/platform/dri/OWNERS b/ui/ozone/platform/drm/OWNERS
index 0d77c0e..0d77c0e 100644
--- a/ui/ozone/platform/dri/OWNERS
+++ b/ui/ozone/platform/drm/OWNERS
diff --git a/ui/ozone/platform/drm/drm.gypi b/ui/ozone/platform/drm/drm.gypi
new file mode 100644
index 0000000..9128a6e
--- /dev/null
+++ b/ui/ozone/platform/drm/drm.gypi
@@ -0,0 +1,132 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'internal_ozone_platform_deps': [
+      'ozone_platform_drm',
+    ],
+    'internal_ozone_platform_unittest_deps': [
+      'ozone_platform_drm_unittests',
+    ],
+    'internal_ozone_platforms': [
+      'dri',
+    ],
+  },
+  'targets': [
+    {
+      'target_name': 'ozone_platform_drm',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../build/linux/system.gyp:libdrm',
+        '../../skia/skia.gyp:skia',
+        '../base/ui_base.gyp:ui_base',
+        '../display/display.gyp:display_types',
+        '../display/display.gyp:display_util',
+        '../events/devices/events_devices.gyp:events_devices',
+        '../events/events.gyp:events',
+        '../events/ozone/events_ozone.gyp:events_ozone_evdev',
+        '../events/ozone/events_ozone.gyp:events_ozone_layout',
+        '../events/platform/events_platform.gyp:events_platform',
+        '../gfx/gfx.gyp:gfx',
+        '../gfx/gfx.gyp:gfx_geometry',
+      ],
+      'defines': [
+        'OZONE_IMPLEMENTATION',
+      ],
+      'sources': [
+        'drm_surface_factory.cc',
+        'drm_surface_factory.h',
+        'gpu/crtc_controller.cc',
+        'gpu/crtc_controller.h',
+        'gpu/display_change_observer.h',
+        'gpu/drm_buffer.cc',
+        'gpu/drm_buffer.h',
+        'gpu/drm_console_buffer.cc',
+        'gpu/drm_console_buffer.h',
+        'gpu/drm_device.cc',
+        'gpu/drm_device.h',
+        'gpu/drm_device_generator.cc',
+        'gpu/drm_device_generator.h',
+        'gpu/drm_device_manager.cc',
+        'gpu/drm_device_manager.h',
+        'gpu/drm_display_mode.cc',
+        'gpu/drm_display_mode.h',
+        'gpu/drm_display_snapshot.cc',
+        'gpu/drm_display_snapshot.h',
+        'gpu/drm_gpu_display_manager.cc',
+        'gpu/drm_gpu_display_manager.h',
+        'gpu/drm_gpu_platform_support.cc',
+        'gpu/drm_gpu_platform_support.h',
+        'gpu/drm_surface.cc',
+        'gpu/drm_surface.h',
+        'gpu/drm_util.cc',
+        'gpu/drm_util.h',
+        'gpu/drm_vsync_provider.cc',
+        'gpu/drm_vsync_provider.h',
+        'gpu/drm_window.cc',
+        'gpu/drm_window.h',
+        'gpu/drm_window_manager.cc',
+        'gpu/drm_window_manager.h',
+        'gpu/hardware_display_controller.cc',
+        'gpu/hardware_display_controller.h',
+        'gpu/hardware_display_plane.cc',
+        'gpu/hardware_display_plane.h',
+        'gpu/hardware_display_plane_manager.cc',
+        'gpu/hardware_display_plane_manager.h',
+        'gpu/hardware_display_plane_manager_legacy.cc',
+        'gpu/hardware_display_plane_manager_legacy.h',
+        'gpu/overlay_plane.cc',
+        'gpu/overlay_plane.h',
+        'gpu/scoped_drm_types.cc',
+        'gpu/scoped_drm_types.h',
+        'gpu/screen_manager.cc',
+        'gpu/screen_manager.h',
+        'host/channel_observer.h',
+        'host/display_manager.cc',
+        'host/display_manager.h',
+        'host/drm_cursor.cc',
+        'host/drm_cursor.h',
+        'host/drm_gpu_platform_support_host.cc',
+        'host/drm_gpu_platform_support_host.h',
+        'host/drm_native_display_delegate.cc',
+        'host/drm_native_display_delegate.h',
+        'host/drm_window_host.cc',
+        'host/drm_window_host.h',
+        'host/drm_window_host_manager.cc',
+        'host/drm_window_host_manager.h',
+        'ozone_platform_drm.cc',
+        'ozone_platform_drm.h',
+        'scanout_buffer.h',
+      ],
+    },
+    {
+      'target_name': 'ozone_platform_drm_unittests',
+      'type': 'none',
+      'dependencies': [
+        '../../build/linux/system.gyp:libdrm',
+        '../../skia/skia.gyp:skia',
+        '../gfx/gfx.gyp:gfx_geometry',
+        'ozone.gyp:ozone',
+      ],
+      'export_dependent_settings': [
+        '../../build/linux/system.gyp:libdrm',
+        '../../skia/skia.gyp:skia',
+        '../gfx/gfx.gyp:gfx_geometry',
+      ],
+      'direct_dependent_settings': {
+        'sources': [
+          'gpu/drm_surface_unittest.cc',
+          'gpu/drm_window_unittest.cc',
+          'gpu/hardware_display_controller_unittest.cc',
+          'gpu/hardware_display_plane_manager_unittest.cc',
+          'gpu/screen_manager_unittest.cc',
+          'test/mock_drm_device.cc',
+          'test/mock_drm_device.h',
+        ],
+      },
+    },
+  ],
+}
diff --git a/ui/ozone/platform/drm/drm_surface_factory.cc b/ui/ozone/platform/drm/drm_surface_factory.cc
new file mode 100644
index 0000000..41a3a1c
--- /dev/null
+++ b/ui/ozone/platform/drm/drm_surface_factory.cc
@@ -0,0 +1,38 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/platform/drm/drm_surface_factory.h"
+
+#include <errno.h>
+
+#include "ui/gfx/native_widget_types.h"
+#include "ui/ozone/platform/drm/gpu/drm_surface.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/public/surface_ozone_canvas.h"
+
+namespace ui {
+
+DrmSurfaceFactory::DrmSurfaceFactory(DrmWindowManager* window_manager)
+    : window_manager_(window_manager) {
+}
+
+DrmSurfaceFactory::~DrmSurfaceFactory() {
+}
+
+scoped_ptr<ui::SurfaceOzoneCanvas> DrmSurfaceFactory::CreateCanvasForWidget(
+    gfx::AcceleratedWidget widget) {
+  return make_scoped_ptr(
+      new DrmSurface(window_manager_->GetWindowDelegate(widget)));
+}
+
+bool DrmSurfaceFactory::LoadEGLGLES2Bindings(
+    AddGLLibraryCallback add_gl_library,
+    SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
+  return false;
+}
+
+}  // namespace ui
diff --git a/ui/ozone/platform/dri/dri_surface_factory.h b/ui/ozone/platform/drm/drm_surface_factory.h
index 58bc748..70a9110 100644
--- a/ui/ozone/platform/dri/dri_surface_factory.h
+++ b/ui/ozone/platform/drm/drm_surface_factory.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
+#ifndef UI_OZONE_PLATFORM_DRM_DRM_SURFACE_FACTORY_H_
+#define UI_OZONE_PLATFORM_DRM_DRM_SURFACE_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
 
-class DriWindowDelegateManager;
+class DrmWindowManager;
 class SurfaceOzoneCanvas;
 
 // SurfaceFactoryOzone implementation on top of DRM/KMS using dumb buffers.
 // This implementation is used in conjunction with the software rendering
 // path.
-class DriSurfaceFactory : public SurfaceFactoryOzone {
+class DrmSurfaceFactory : public SurfaceFactoryOzone {
  public:
-  DriSurfaceFactory(DriWindowDelegateManager* window_manager);
-  ~DriSurfaceFactory() override;
+  DrmSurfaceFactory(DrmWindowManager* window_manager);
+  ~DrmSurfaceFactory() override;
 
   // SurfaceFactoryOzone:
   scoped_ptr<SurfaceOzoneCanvas> CreateCanvasForWidget(
@@ -29,11 +29,11 @@ class DriSurfaceFactory : public SurfaceFactoryOzone {
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
 
  protected:
-  DriWindowDelegateManager* window_manager_;  // Not owned.
+  DrmWindowManager* window_manager_;  // Not owned.
 
-  DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
+  DISALLOW_COPY_AND_ASSIGN(DrmSurfaceFactory);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
+#endif  // UI_OZONE_PLATFORM_DRM_DRM_SURFACE_FACTORY_H_
diff --git a/ui/ozone/platform/dri/gbm.gypi b/ui/ozone/platform/drm/gbm.gypi
index 19d3a0d..b160e8f 100644
--- a/ui/ozone/platform/dri/gbm.gypi
+++ b/ui/ozone/platform/drm/gbm.gypi
@@ -33,18 +33,18 @@
         'OZONE_IMPLEMENTATION',
       ],
       'sources': [
-        'gbm_buffer.cc',
-        'gbm_buffer.h',
-        'gbm_buffer_base.cc',
-        'gbm_buffer_base.h',
-        'gbm_device.cc',
-        'gbm_device.h',
-        'gbm_surface.cc',
-        'gbm_surface.h',
         'gbm_surface_factory.cc',
         'gbm_surface_factory.h',
-        'gbm_surfaceless.cc',
-        'gbm_surfaceless.h',
+        'gpu/gbm_buffer.cc',
+        'gpu/gbm_buffer.h',
+        'gpu/gbm_buffer_base.cc',
+        'gpu/gbm_buffer_base.h',
+        'gpu/gbm_device.cc',
+        'gpu/gbm_device.h',
+        'gpu/gbm_surface.cc',
+        'gpu/gbm_surface.h',
+        'gpu/gbm_surfaceless.cc',
+        'gpu/gbm_surfaceless.h',
         'ozone_platform_gbm.cc',
         'ozone_platform_gbm.h',
       ],
diff --git a/ui/ozone/platform/dri/gbm_surface_factory.cc b/ui/ozone/platform/drm/gbm_surface_factory.cc
index 25c0914..262fd66 100644
--- a/ui/ozone/platform/dri/gbm_surface_factory.cc
+++ b/ui/ozone/platform/drm/gbm_surface_factory.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_surface_factory.h"
+#include "ui/ozone/platform/drm/gbm_surface_factory.h"
 
 #include <gbm.h>
 
@@ -10,14 +10,14 @@
 #include "base/files/file_path.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/ozone/common/egl_util.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/gbm_buffer.h"
-#include "ui/ozone/platform/dri/gbm_device.h"
-#include "ui/ozone/platform/dri/gbm_surface.h"
-#include "ui/ozone/platform/dri/gbm_surfaceless.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/gbm_device.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surface.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/overlay_candidates_ozone.h"
 #include "ui/ozone/public/ozone_switches.h"
@@ -70,14 +70,14 @@ class SingleOverlay : public OverlayCandidatesOzone {
 }  // namespace
 
 GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
-    : DriSurfaceFactory(NULL), allow_surfaceless_(allow_surfaceless) {
+    : DrmSurfaceFactory(NULL), allow_surfaceless_(allow_surfaceless) {
 }
 
-GbmSurfaceFactory::~GbmSurfaceFactory() {}
+GbmSurfaceFactory::~GbmSurfaceFactory() {
+}
 
-void GbmSurfaceFactory::InitializeGpu(
-    DrmDeviceManager* drm_device_manager,
-    DriWindowDelegateManager* window_manager) {
+void GbmSurfaceFactory::InitializeGpu(DrmDeviceManager* drm_device_manager,
+                                      DrmWindowManager* window_manager) {
   drm_device_manager_ = drm_device_manager;
   window_manager_ = window_manager;
 }
@@ -100,23 +100,28 @@ int GbmSurfaceFactory::GetDrmFd() {
 
 const int32* GbmSurfaceFactory::GetEGLSurfaceProperties(
     const int32* desired_list) {
-  static const int32 kConfigAttribs[] = {
-    EGL_BUFFER_SIZE, 32,
-    EGL_ALPHA_SIZE, 8,
-    EGL_BLUE_SIZE, 8,
-    EGL_GREEN_SIZE, 8,
-    EGL_RED_SIZE, 8,
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-    EGL_NONE
-  };
+  static const int32 kConfigAttribs[] = {EGL_BUFFER_SIZE,
+                                         32,
+                                         EGL_ALPHA_SIZE,
+                                         8,
+                                         EGL_BLUE_SIZE,
+                                         8,
+                                         EGL_GREEN_SIZE,
+                                         8,
+                                         EGL_RED_SIZE,
+                                         8,
+                                         EGL_RENDERABLE_TYPE,
+                                         EGL_OPENGL_ES2_BIT,
+                                         EGL_SURFACE_TYPE,
+                                         EGL_WINDOW_BIT,
+                                         EGL_NONE};
 
   return kConfigAttribs;
 }
 
 bool GbmSurfaceFactory::LoadEGLGLES2Bindings(
-      AddGLLibraryCallback add_gl_library,
-      SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
+    AddGLLibraryCallback add_gl_library,
+    SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
 }
 
@@ -197,10 +202,8 @@ bool GbmSurfaceFactory::ScheduleOverlayPlane(
   if (!hdc)
     return true;
 
-  hdc->QueueOverlayPlane(OverlayPlane(pixmap->buffer(),
-                                      plane_z_order,
-                                      plane_transform,
-                                      display_bounds,
+  hdc->QueueOverlayPlane(OverlayPlane(pixmap->buffer(), plane_z_order,
+                                      plane_transform, display_bounds,
                                       crop_rect));
   return true;
 }
diff --git a/ui/ozone/platform/dri/gbm_surface_factory.h b/ui/ozone/platform/drm/gbm_surface_factory.h
index 7b10b08..d93f559 100644
--- a/ui/ozone/platform/dri/gbm_surface_factory.h
+++ b/ui/ozone/platform/drm/gbm_surface_factory.h
@@ -2,27 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GBM_SURFACE_FACTORY_H_
+#define UI_OZONE_PLATFORM_DRM_GBM_SURFACE_FACTORY_H_
 
-#include "ui/ozone/platform/dri/dri_surface_factory.h"
+#include "ui/ozone/platform/drm/drm_surface_factory.h"
 
 namespace ui {
 
-class DriWindowDelegate;
-class DriWindowDelegateManager;
 class DrmDeviceManager;
+class DrmWindow;
+class DrmWindowManager;
 class GbmDevice;
 
-class GbmSurfaceFactory : public DriSurfaceFactory {
+class GbmSurfaceFactory : public DrmSurfaceFactory {
  public:
   GbmSurfaceFactory(bool allow_surfaceless);
   ~GbmSurfaceFactory() override;
 
   void InitializeGpu(DrmDeviceManager* drm_device_manager,
-                     DriWindowDelegateManager* window_manager);
+                     DrmWindowManager* window_manager);
 
-  // DriSurfaceFactory:
+  // DrmSurfaceFactory:
   intptr_t GetNativeDisplay() override;
   int GetDrmFd() override;
   const int32_t* GetEGLSurfaceProperties(const int32_t* desired_list) override;
@@ -63,4 +63,4 @@ class GbmSurfaceFactory : public DriSurfaceFactory {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GBM_SURFACE_FACTORY_H_
diff --git a/ui/ozone/platform/drm/gpu/DEPS b/ui/ozone/platform/drm/gpu/DEPS
new file mode 100644
index 0000000..20d37d9
--- /dev/null
+++ b/ui/ozone/platform/drm/gpu/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "-ui/ozone/platform/drm/host",
+]
diff --git a/ui/ozone/platform/dri/crtc_controller.cc b/ui/ozone/platform/drm/gpu/crtc_controller.cc
index d9e86f2..00006db 100644
--- a/ui/ozone/platform/dri/crtc_controller.cc
+++ b/ui/ozone/platform/drm/gpu/crtc_controller.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/page_flip_observer.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/page_flip_observer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/crtc_controller.h b/ui/ozone/platform/drm/gpu/crtc_controller.h
index 827515c..29135dc 100644
--- a/ui/ozone/platform/dri/crtc_controller.h
+++ b/ui/ozone/platform/drm/gpu/crtc_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_CRTC_CONTROLLER_H_
-#define UI_OZONE_PLATFORM_DRI_CRTC_CONTROLLER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_CRTC_CONTROLLER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_CRTC_CONTROLLER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -12,9 +12,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
-#include "ui/ozone/platform/dri/overlay_plane.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/overlay_plane.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace ui {
 
@@ -114,4 +114,4 @@ class OZONE_EXPORT CrtcController
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_CRTC_CONTROLLER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_CRTC_CONTROLLER_H_
diff --git a/ui/ozone/platform/dri/display_change_observer.h b/ui/ozone/platform/drm/gpu/display_change_observer.h
index a174cf6..9896770 100644
--- a/ui/ozone/platform/dri/display_change_observer.h
+++ b/ui/ozone/platform/drm/gpu/display_change_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DISPLAY_CHANGE_OBSERVER_H_
-#define UI_OZONE_PLATFORM_DRI_DISPLAY_CHANGE_OBSERVER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DISPLAY_CHANGE_OBSERVER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DISPLAY_CHANGE_OBSERVER_H_
 
 namespace ui {
 
@@ -23,4 +23,4 @@ class DisplayChangeObserver {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DISPLAY_CHANGE_OBSERVER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DISPLAY_CHANGE_OBSERVER_H_
diff --git a/ui/ozone/platform/dri/dri_buffer.cc b/ui/ozone/platform/drm/gpu/drm_buffer.cc
index bd2c2c2..12e0a8e 100644
--- a/ui/ozone/platform/dri/dri_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/drm_buffer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
 
 #include "base/logging.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
@@ -34,11 +34,11 @@ uint8_t GetColorDepth(SkColorType type) {
 
 }  // namespace
 
-DriBuffer::DriBuffer(const scoped_refptr<DrmDevice>& drm)
+DrmBuffer::DrmBuffer(const scoped_refptr<DrmDevice>& drm)
     : drm_(drm), handle_(0), framebuffer_(0) {
 }
 
-DriBuffer::~DriBuffer() {
+DrmBuffer::~DrmBuffer() {
   if (!surface_)
     return;
 
@@ -53,7 +53,7 @@ DriBuffer::~DriBuffer() {
   drm_->DestroyDumbBuffer(info, handle_, stride_, pixels);
 }
 
-bool DriBuffer::Initialize(const SkImageInfo& info,
+bool DrmBuffer::Initialize(const SkImageInfo& info,
                            bool should_register_framebuffer) {
   void* pixels = NULL;
   if (!drm_->CreateDumbBuffer(info, &handle_, &stride_, &pixels)) {
@@ -78,31 +78,32 @@ bool DriBuffer::Initialize(const SkImageInfo& info,
   return true;
 }
 
-SkCanvas* DriBuffer::GetCanvas() const {
+SkCanvas* DrmBuffer::GetCanvas() const {
   return surface_->getCanvas();
 }
 
-uint32_t DriBuffer::GetFramebufferId() const {
+uint32_t DrmBuffer::GetFramebufferId() const {
   return framebuffer_;
 }
 
-uint32_t DriBuffer::GetHandle() const {
+uint32_t DrmBuffer::GetHandle() const {
   return handle_;
 }
 
-gfx::Size DriBuffer::GetSize() const {
+gfx::Size DrmBuffer::GetSize() const {
   return gfx::Size(surface_->width(), surface_->height());
 }
 
-DriBufferGenerator::DriBufferGenerator() {
+DrmBufferGenerator::DrmBufferGenerator() {
 }
 
-DriBufferGenerator::~DriBufferGenerator() {}
+DrmBufferGenerator::~DrmBufferGenerator() {
+}
 
-scoped_refptr<ScanoutBuffer> DriBufferGenerator::Create(
+scoped_refptr<ScanoutBuffer> DrmBufferGenerator::Create(
     const scoped_refptr<DrmDevice>& drm,
     const gfx::Size& size) {
-  scoped_refptr<DriBuffer> buffer(new DriBuffer(drm));
+  scoped_refptr<DrmBuffer> buffer(new DrmBuffer(drm));
   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
   if (!buffer->Initialize(info, true /* should_register_framebuffer */))
     return NULL;
diff --git a/ui/ozone/platform/dri/dri_buffer.h b/ui/ozone/platform/drm/gpu/drm_buffer.h
index 0b9f8e6..18ad9af 100644
--- a/ui/ozone/platform/dri/dri_buffer.h
+++ b/ui/ozone/platform/drm/gpu/drm_buffer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_BUFFER_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_BUFFER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_BUFFER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_BUFFER_H_
 
 #include "base/macros.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
@@ -18,9 +18,9 @@ class DrmDevice;
 // Wrapper for a DRM allocated buffer. Keeps track of the native properties of
 // the buffer and wraps the pixel memory into a SkSurface which can be used to
 // draw into using Skia.
-class OZONE_EXPORT DriBuffer : public ScanoutBuffer {
+class OZONE_EXPORT DrmBuffer : public ScanoutBuffer {
  public:
-  DriBuffer(const scoped_refptr<DrmDevice>& drm);
+  DrmBuffer(const scoped_refptr<DrmDevice>& drm);
 
   // Allocates the backing pixels and wraps them in |surface_|. |info| is used
   // to describe the buffer characteristics (size, color format).
@@ -36,7 +36,7 @@ class OZONE_EXPORT DriBuffer : public ScanoutBuffer {
   gfx::Size GetSize() const override;
 
  protected:
-  ~DriBuffer() override;
+  ~DrmBuffer() override;
 
   scoped_refptr<DrmDevice> drm_;
 
@@ -53,22 +53,22 @@ class OZONE_EXPORT DriBuffer : public ScanoutBuffer {
   // registered with the CRTC.
   uint32_t framebuffer_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriBuffer);
+  DISALLOW_COPY_AND_ASSIGN(DrmBuffer);
 };
 
-class OZONE_EXPORT DriBufferGenerator : public ScanoutBufferGenerator {
+class OZONE_EXPORT DrmBufferGenerator : public ScanoutBufferGenerator {
  public:
-  DriBufferGenerator();
-  ~DriBufferGenerator() override;
+  DrmBufferGenerator();
+  ~DrmBufferGenerator() override;
 
   // ScanoutBufferGenerator:
   scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DrmDevice>& drm,
                                       const gfx::Size& size) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DriBufferGenerator);
+  DISALLOW_COPY_AND_ASSIGN(DrmBufferGenerator);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_BUFFER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_BUFFER_H_
diff --git a/ui/ozone/platform/dri/dri_console_buffer.cc b/ui/ozone/platform/drm/gpu/drm_console_buffer.cc
index 91aba48..743fbae 100644
--- a/ui/ozone/platform/dri/dri_console_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/drm_console_buffer.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_console_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_console_buffer.h"
 
 #include <sys/mman.h>
 #include <xf86drmMode.h>
 
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace ui {
 
-DriConsoleBuffer::DriConsoleBuffer(const scoped_refptr<DrmDevice>& drm,
+DrmConsoleBuffer::DrmConsoleBuffer(const scoped_refptr<DrmDevice>& drm,
                                    uint32_t framebuffer)
     : drm_(drm),
       handle_(0),
@@ -23,13 +23,13 @@ DriConsoleBuffer::DriConsoleBuffer(const scoped_refptr<DrmDevice>& drm,
       mmap_size_(0) {
 }
 
-DriConsoleBuffer::~DriConsoleBuffer() {
+DrmConsoleBuffer::~DrmConsoleBuffer() {
   if (mmap_base_)
     if (munmap(mmap_base_, mmap_size_))
       PLOG(ERROR) << "munmap";
 }
 
-bool DriConsoleBuffer::Initialize() {
+bool DrmConsoleBuffer::Initialize() {
   ScopedDrmFramebufferPtr fb(drm_->GetFramebuffer(framebuffer_));
 
   if (!fb)
diff --git a/ui/ozone/platform/dri/dri_console_buffer.h b/ui/ozone/platform/drm/gpu/drm_console_buffer.h
index e174955..5e92f74 100644
--- a/ui/ozone/platform/dri/dri_console_buffer.h
+++ b/ui/ozone/platform/drm/gpu/drm_console_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_CONSOLE_BUFFER_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_CONSOLE_BUFFER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_CONSOLE_BUFFER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_CONSOLE_BUFFER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -20,10 +20,10 @@ class DrmDevice;
 // default by the system and is used when no application is controlling the
 // CRTC. Keeps track of the native properties of the buffer and wraps the pixel
 // memory into a SkSurface which can be used to draw into using Skia.
-class DriConsoleBuffer {
+class DrmConsoleBuffer {
  public:
-  DriConsoleBuffer(const scoped_refptr<DrmDevice>& drm, uint32_t framebuffer);
-  ~DriConsoleBuffer();
+  DrmConsoleBuffer(const scoped_refptr<DrmDevice>& drm, uint32_t framebuffer);
+  ~DrmConsoleBuffer();
 
   SkCanvas* canvas() { return surface_->getCanvas(); }
   skia::RefPtr<SkImage> image() {
@@ -54,9 +54,9 @@ class DriConsoleBuffer {
   // Memory map size.
   size_t mmap_size_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriConsoleBuffer);
+  DISALLOW_COPY_AND_ASSIGN(DrmConsoleBuffer);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_CONSOLE_BUFFER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_CONSOLE_BUFFER_H_
diff --git a/ui/ozone/platform/dri/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
index e51059d..0a4952f 100644
--- a/ui/ozone/platform/dri/drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
@@ -18,8 +18,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
 
 namespace ui {
 
@@ -151,7 +151,7 @@ class DrmDevice::IOWatcher
   // base::MessagePumpLibevent::Watcher overrides:
   void OnFileCanReadWithoutBlocking(int fd) override {
     DCHECK(base::MessageLoopForIO::IsCurrent());
-    TRACE_EVENT1("dri", "OnDrmEvent", "socket", fd);
+    TRACE_EVENT1("drm", "OnDrmEvent", "socket", fd);
 
     drmEventContext event;
     event.version = DRM_EVENT_CONTEXT_VERSION;
@@ -231,7 +231,7 @@ bool DrmDevice::SetCrtc(uint32_t crtc_id,
   DCHECK(!connectors.empty());
   DCHECK(mode);
 
-  TRACE_EVENT2("dri", "DrmDevice::SetCrtc", "crtc", crtc_id, "size",
+  TRACE_EVENT2("drm", "DrmDevice::SetCrtc", "crtc", crtc_id, "size",
                gfx::Size(mode->hdisplay, mode->vdisplay).ToString());
   return !drmModeSetCrtc(file_.GetPlatformFile(), crtc_id, framebuffer, 0, 0,
                          vector_as_array(&connectors), connectors.size(), mode);
@@ -245,7 +245,7 @@ bool DrmDevice::SetCrtc(drmModeCrtc* crtc, std::vector<uint32_t> connectors) {
 
   DCHECK(!connectors.empty());
 
-  TRACE_EVENT1("dri", "DrmDevice::RestoreCrtc", "crtc", crtc->crtc_id);
+  TRACE_EVENT1("drm", "DrmDevice::RestoreCrtc", "crtc", crtc->crtc_id);
   return !drmModeSetCrtc(file_.GetPlatformFile(), crtc->crtc_id,
                          crtc->buffer_id, crtc->x, crtc->y,
                          vector_as_array(&connectors), connectors.size(),
@@ -254,14 +254,14 @@ bool DrmDevice::SetCrtc(drmModeCrtc* crtc, std::vector<uint32_t> connectors) {
 
 bool DrmDevice::DisableCrtc(uint32_t crtc_id) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::DisableCrtc", "crtc", crtc_id);
+  TRACE_EVENT1("drm", "DrmDevice::DisableCrtc", "crtc", crtc_id);
   return !drmModeSetCrtc(file_.GetPlatformFile(), crtc_id, 0, 0, 0, NULL, 0,
                          NULL);
 }
 
 ScopedDrmConnectorPtr DrmDevice::GetConnector(uint32_t connector_id) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::GetConnector", "connector", connector_id);
+  TRACE_EVENT1("drm", "DrmDevice::GetConnector", "connector", connector_id);
   return ScopedDrmConnectorPtr(
       drmModeGetConnector(file_.GetPlatformFile(), connector_id));
 }
@@ -274,14 +274,14 @@ bool DrmDevice::AddFramebuffer(uint32_t width,
                                uint32_t handle,
                                uint32_t* framebuffer) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::AddFramebuffer", "handle", handle);
+  TRACE_EVENT1("drm", "DrmDevice::AddFramebuffer", "handle", handle);
   return !drmModeAddFB(file_.GetPlatformFile(), width, height, depth, bpp,
                        stride, handle, framebuffer);
 }
 
 bool DrmDevice::RemoveFramebuffer(uint32_t framebuffer) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::RemoveFramebuffer", "framebuffer",
+  TRACE_EVENT1("drm", "DrmDevice::RemoveFramebuffer", "framebuffer",
                framebuffer);
   return !drmModeRmFB(file_.GetPlatformFile(), framebuffer);
 }
@@ -291,7 +291,7 @@ bool DrmDevice::PageFlip(uint32_t crtc_id,
                          bool is_sync,
                          const PageFlipCallback& callback) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT2("dri", "DrmDevice::PageFlip", "crtc", crtc_id, "framebuffer",
+  TRACE_EVENT2("drm", "DrmDevice::PageFlip", "crtc", crtc_id, "framebuffer",
                framebuffer);
 
   if (watcher_)
@@ -309,7 +309,7 @@ bool DrmDevice::PageFlip(uint32_t crtc_id,
     // If the flip was requested synchronous or if no watcher has been installed
     // yet, then synchronously handle the page flip events.
     if (is_sync || !watcher_) {
-      TRACE_EVENT1("dri", "OnDrmEvent", "socket", file_.GetPlatformFile());
+      TRACE_EVENT1("drm", "OnDrmEvent", "socket", file_.GetPlatformFile());
 
       drmEventContext event;
       event.version = DRM_EVENT_CONTEXT_VERSION;
@@ -331,7 +331,7 @@ bool DrmDevice::PageFlipOverlay(uint32_t crtc_id,
                                 const gfx::Rect& source,
                                 int overlay_plane) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT2("dri", "DrmDevice::PageFlipOverlay", "crtc", crtc_id,
+  TRACE_EVENT2("drm", "DrmDevice::PageFlipOverlay", "crtc", crtc_id,
                "framebuffer", framebuffer);
   return !drmModeSetPlane(file_.GetPlatformFile(), overlay_plane, crtc_id,
                           framebuffer, 0, location.x(), location.y(),
@@ -341,14 +341,14 @@ bool DrmDevice::PageFlipOverlay(uint32_t crtc_id,
 
 ScopedDrmFramebufferPtr DrmDevice::GetFramebuffer(uint32_t framebuffer) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::GetFramebuffer", "framebuffer", framebuffer);
+  TRACE_EVENT1("drm", "DrmDevice::GetFramebuffer", "framebuffer", framebuffer);
   return ScopedDrmFramebufferPtr(
       drmModeGetFB(file_.GetPlatformFile(), framebuffer));
 }
 
 ScopedDrmPropertyPtr DrmDevice::GetProperty(drmModeConnector* connector,
                                             const char* name) {
-  TRACE_EVENT2("dri", "DrmDevice::GetProperty", "connector",
+  TRACE_EVENT2("drm", "DrmDevice::GetProperty", "connector",
                connector->connector_id, "name", name);
   for (int i = 0; i < connector->count_props; ++i) {
     ScopedDrmPropertyPtr property(
@@ -379,7 +379,7 @@ bool DrmDevice::GetCapability(uint64_t capability, uint64_t* value) {
 ScopedDrmPropertyBlobPtr DrmDevice::GetPropertyBlob(drmModeConnector* connector,
                                                     const char* name) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT2("dri", "DrmDevice::GetPropertyBlob", "connector",
+  TRACE_EVENT2("drm", "DrmDevice::GetPropertyBlob", "connector",
                connector->connector_id, "name", name);
   for (int i = 0; i < connector->count_props; ++i) {
     ScopedDrmPropertyPtr property(
@@ -400,7 +400,7 @@ bool DrmDevice::SetCursor(uint32_t crtc_id,
                           uint32_t handle,
                           const gfx::Size& size) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::SetCursor", "handle", handle);
+  TRACE_EVENT1("drm", "DrmDevice::SetCursor", "handle", handle);
   return !drmModeSetCursor(file_.GetPlatformFile(), crtc_id, handle,
                            size.width(), size.height());
 }
@@ -417,7 +417,7 @@ bool DrmDevice::CreateDumbBuffer(const SkImageInfo& info,
                                  void** pixels) {
   DCHECK(file_.IsValid());
 
-  TRACE_EVENT0("dri", "DrmDevice::CreateDumbBuffer");
+  TRACE_EVENT0("drm", "DrmDevice::CreateDumbBuffer");
   if (!DrmCreateDumbBuffer(file_.GetPlatformFile(), info, handle, stride))
     return false;
 
@@ -435,7 +435,7 @@ void DrmDevice::DestroyDumbBuffer(const SkImageInfo& info,
                                   uint32_t stride,
                                   void* pixels) {
   DCHECK(file_.IsValid());
-  TRACE_EVENT1("dri", "DrmDevice::DestroyDumbBuffer", "handle", handle);
+  TRACE_EVENT1("drm", "DrmDevice::DestroyDumbBuffer", "handle", handle);
   munmap(pixels, info.getSafeSize(stride));
   DrmDestroyDumbBuffer(file_.GetPlatformFile(), handle);
 }
diff --git a/ui/ozone/platform/dri/drm_device.h b/ui/ozone/platform/drm/gpu/drm_device.h
index 73b42bc..6ff1982 100644
--- a/ui/ozone/platform/dri/drm_device.h
+++ b/ui/ozone/platform/drm/gpu/drm_device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRM_DEVICE_H_
-#define UI_OZONE_PLATFORM_DRI_DRM_DEVICE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_
 
 #include <stdint.h>
 
@@ -19,8 +19,8 @@
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 typedef struct _drmEventContext drmEventContext;
 typedef struct _drmModeModeInfo drmModeModeInfo;
@@ -191,4 +191,4 @@ class OZONE_EXPORT DrmDevice : public base::RefCountedThreadSafe<DrmDevice> {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRM_DEVICE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_H_
diff --git a/ui/ozone/platform/dri/drm_device_generator.cc b/ui/ozone/platform/drm/gpu/drm_device_generator.cc
index f6f6f33..75ca66e 100644
--- a/ui/ozone/platform/dri/drm_device_generator.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device_generator.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/drm_device_generator.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
 
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/drm_device_generator.h b/ui/ozone/platform/drm/gpu/drm_device_generator.h
index 8d59f72..aebf9b8 100644
--- a/ui/ozone/platform/dri/drm_device_generator.h
+++ b/ui/ozone/platform/drm/gpu/drm_device_generator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRM_DEVICE_GENERATOR_H_
-#define UI_OZONE_PLATFORM_DRI_DRM_DEVICE_GENERATOR_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_GENERATOR_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_GENERATOR_H_
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
@@ -29,4 +29,4 @@ class DrmDeviceGenerator {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRM_DEVICE_GENERATOR_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_GENERATOR_H_
diff --git a/ui/ozone/platform/dri/drm_device_manager.cc b/ui/ozone/platform/drm/gpu/drm_device_manager.cc
index d04aee0..c974276 100644
--- a/ui/ozone/platform/dri/drm_device_manager.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device_manager.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
 
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/drm_device_manager.h b/ui/ozone/platform/drm/gpu/drm_device_manager.h
index 5a7431e..4d0a97b 100644
--- a/ui/ozone/platform/dri/drm_device_manager.h
+++ b/ui/ozone/platform/drm/gpu/drm_device_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRM_DEVICE_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_DRM_DEVICE_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
 
 #include <map>
 
@@ -54,4 +54,4 @@ class OZONE_EXPORT DrmDeviceManager {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRM_DEVICE_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DEVICE_MANAGER_H_
diff --git a/ui/ozone/platform/dri/display_mode_dri.cc b/ui/ozone/platform/drm/gpu/drm_display_mode.cc
index c3d40d0..b97d2d8 100644
--- a/ui/ozone/platform/dri/display_mode_dri.cc
+++ b/ui/ozone/platform/drm/gpu/drm_display_mode.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/display_mode_dri.h"
+#include "ui/ozone/platform/drm/gpu/drm_display_mode.h"
 
 namespace ui {
 
@@ -21,14 +21,14 @@ float GetRefreshRate(const drmModeModeInfo& mode) {
 
 }  // namespace
 
-DisplayModeDri::DisplayModeDri(const drmModeModeInfo& mode)
+DrmDisplayMode::DrmDisplayMode(const drmModeModeInfo& mode)
     : DisplayMode(gfx::Size(mode.hdisplay, mode.vdisplay),
                   mode.flags & DRM_MODE_FLAG_INTERLACE,
                   GetRefreshRate(mode)),
       mode_info_(mode) {
 }
 
-DisplayModeDri::~DisplayModeDri() {
+DrmDisplayMode::~DrmDisplayMode() {
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/dri/display_mode_dri.h b/ui/ozone/platform/drm/gpu/drm_display_mode.h
index d37f8e2..e0d39d4a 100644
--- a/ui/ozone/platform/dri/display_mode_dri.h
+++ b/ui/ozone/platform/drm/gpu/drm_display_mode.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DISPLAY_MODE_DRI_H_
-#define UI_OZONE_PLATFORM_DRI_DISPLAY_MODE_DRI_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_MODE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_MODE_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -13,21 +13,21 @@
 
 namespace ui {
 
-class DisplayModeDri : public DisplayMode {
+class DrmDisplayMode : public DisplayMode {
  public:
-  DisplayModeDri(const drmModeModeInfo& mode);
-  ~DisplayModeDri() override;
+  DrmDisplayMode(const drmModeModeInfo& mode);
+  ~DrmDisplayMode() override;
 
-  // Native details about this mode. Only used internally in the DRI
+  // Native details about this mode. Only used internally in the DRM
   // implementation.
   drmModeModeInfo mode_info() const { return mode_info_; }
 
  private:
   drmModeModeInfo mode_info_;
 
-  DISALLOW_COPY_AND_ASSIGN(DisplayModeDri);
+  DISALLOW_COPY_AND_ASSIGN(DrmDisplayMode);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DISPLAY_MODE_DRI_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_MODE_H_
diff --git a/ui/ozone/platform/dri/display_snapshot_dri.cc b/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc
index 164d5ee..96e0a2f 100644
--- a/ui/ozone/platform/dri/display_snapshot_dri.cc
+++ b/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/display_snapshot_dri.h"
+#include "ui/ozone/platform/drm/gpu/drm_display_snapshot.h"
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -12,9 +12,9 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/util/edid_parser.h"
-#include "ui/ozone/platform/dri/display_mode_dri.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_display_mode.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
 
 #if !defined(DRM_MODE_CONNECTOR_DSI)
 #define DRM_MODE_CONNECTOR_DSI 16
@@ -67,7 +67,7 @@ bool IsAspectPreserving(DrmDevice* drm, drmModeConnector* connector) {
 
 }  // namespace
 
-DisplaySnapshotDri::DisplaySnapshotDri(const scoped_refptr<DrmDevice>& drm,
+DrmDisplaySnapshot::DrmDisplaySnapshot(const scoped_refptr<DrmDevice>& drm,
                                        drmModeConnector* connector,
                                        drmModeCrtc* crtc,
                                        uint32_t index)
@@ -108,7 +108,7 @@ DisplaySnapshotDri::DisplaySnapshotDri(const scoped_refptr<DrmDevice>& drm,
 
   for (int i = 0; i < connector->count_modes; ++i) {
     drmModeModeInfo& mode = connector->modes[i];
-    modes_.push_back(new DisplayModeDri(mode));
+    modes_.push_back(new DrmDisplayMode(mode));
 
     if (crtc->mode_valid && SameMode(crtc->mode, mode))
       current_mode_ = modes_.back();
@@ -123,10 +123,10 @@ DisplaySnapshotDri::DisplaySnapshotDri(const scoped_refptr<DrmDevice>& drm,
     native_mode_ = modes_.front();
 }
 
-DisplaySnapshotDri::~DisplaySnapshotDri() {
+DrmDisplaySnapshot::~DrmDisplaySnapshot() {
 }
 
-std::string DisplaySnapshotDri::ToString() const {
+std::string DrmDisplaySnapshot::ToString() const {
   return base::StringPrintf(
       "[type=%d, connector=%" PRIu32 ", crtc=%" PRIu32
       ", origin=%s, mode=%s, dim=%s]",
diff --git a/ui/ozone/platform/dri/display_snapshot_dri.h b/ui/ozone/platform/drm/gpu/drm_display_snapshot.h
index 2ba7990..62ad1fe 100644
--- a/ui/ozone/platform/dri/display_snapshot_dri.h
+++ b/ui/ozone/platform/drm/gpu/drm_display_snapshot.h
@@ -2,27 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DISPLAY_SNAPSHOT_DRI_H_
-#define UI_OZONE_PLATFORM_DRI_DISPLAY_SNAPSHOT_DRI_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_SNAPSHOT_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_SNAPSHOT_H_
 
 #include "base/memory/ref_counted.h"
 #include "ui/display/types/display_snapshot.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace ui {
 
 class DrmDevice;
 
-class DisplaySnapshotDri : public DisplaySnapshot {
+class DrmDisplaySnapshot : public DisplaySnapshot {
  public:
-  DisplaySnapshotDri(const scoped_refptr<DrmDevice>& drm,
+  DrmDisplaySnapshot(const scoped_refptr<DrmDevice>& drm,
                      drmModeConnector* connector,
                      drmModeCrtc* crtc,
                      uint32_t index);
-  ~DisplaySnapshotDri() override;
+  ~DrmDisplaySnapshot() override;
 
   scoped_refptr<DrmDevice> drm() const { return drm_; }
-  // Native properties of a display used by the DRI implementation in
+  // Native properties of a display used by the DRM implementation in
   // configuring this display.
   uint32_t connector() const { return connector_; }
   uint32_t crtc() const { return crtc_; }
@@ -39,9 +39,9 @@ class DisplaySnapshotDri : public DisplaySnapshot {
   std::string name_;
   bool overscan_flag_;
 
-  DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotDri);
+  DISALLOW_COPY_AND_ASSIGN(DrmDisplaySnapshot);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DISPLAY_SNAPSHOT_DRI_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_DISPLAY_SNAPSHOT_H_
diff --git a/ui/ozone/platform/dri/native_display_delegate_dri.cc b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
index b6dedff..d11c80f 100644
--- a/ui/ozone/platform/dri/native_display_delegate_dri.cc
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/native_display_delegate_dri.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -12,12 +12,12 @@
 #include "ui/display/types/native_display_observer.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/ozone/common/display_util.h"
-#include "ui/ozone/platform/dri/display_mode_dri.h"
-#include "ui/ozone/platform/dri/display_snapshot_dri.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/drm_device_generator.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
+#include "ui/ozone/platform/drm/gpu/drm_display_mode.h"
+#include "ui/ozone/platform/drm/gpu/drm_display_snapshot.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
@@ -56,7 +56,7 @@ uint32_t GetContentProtectionValue(drmModePropertyRes* property,
 
 class DisplaySnapshotComparator {
  public:
-  explicit DisplaySnapshotComparator(const DisplaySnapshotDri* snapshot)
+  explicit DisplaySnapshotComparator(const DrmDisplaySnapshot* snapshot)
       : drm_(snapshot->drm()),
         crtc_(snapshot->crtc()),
         connector_(snapshot->connector()) {}
@@ -66,7 +66,7 @@ class DisplaySnapshotComparator {
                             uint32_t connector)
       : drm_(drm), crtc_(crtc), connector_(connector) {}
 
-  bool operator()(const DisplaySnapshotDri* other) const {
+  bool operator()(const DrmDisplaySnapshot* other) const {
     return drm_ == other->drm() && connector_ == other->connector() &&
            crtc_ == other->crtc();
   }
@@ -91,7 +91,7 @@ class FindByDevicePath {
 
 }  // namespace
 
-NativeDisplayDelegateDri::NativeDisplayDelegateDri(
+DrmGpuDisplayManager::DrmGpuDisplayManager(
     ScreenManager* screen_manager,
     const scoped_refptr<DrmDevice>& primary_device,
     scoped_ptr<DrmDeviceGenerator> drm_device_generator)
@@ -100,10 +100,10 @@ NativeDisplayDelegateDri::NativeDisplayDelegateDri(
   devices_.push_back(primary_device);
 }
 
-NativeDisplayDelegateDri::~NativeDisplayDelegateDri() {
+DrmGpuDisplayManager::~DrmGpuDisplayManager() {
 }
 
-void NativeDisplayDelegateDri::InitializeIOTaskRunner(
+void DrmGpuDisplayManager::InitializeIOTaskRunner(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   DCHECK(!io_task_runner_);
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
@@ -116,7 +116,7 @@ void NativeDisplayDelegateDri::InitializeIOTaskRunner(
     device->InitializeTaskRunner(io_task_runner_);
 }
 
-std::vector<DisplaySnapshot_Params> NativeDisplayDelegateDri::GetDisplays() {
+std::vector<DisplaySnapshot_Params> DrmGpuDisplayManager::GetDisplays() {
   RefreshDisplayList();
 
   std::vector<DisplaySnapshot_Params> displays;
@@ -126,11 +126,11 @@ std::vector<DisplaySnapshot_Params> NativeDisplayDelegateDri::GetDisplays() {
   return displays;
 }
 
-bool NativeDisplayDelegateDri::ConfigureDisplay(
+bool DrmGpuDisplayManager::ConfigureDisplay(
     int64_t id,
     const DisplayMode_Params& mode_param,
     const gfx::Point& origin) {
-  DisplaySnapshotDri* display = FindDisplaySnapshot(id);
+  DrmDisplaySnapshot* display = FindDisplaySnapshot(id);
   if (!display) {
     LOG(ERROR) << "There is no display with ID " << id;
     return false;
@@ -162,7 +162,7 @@ bool NativeDisplayDelegateDri::ConfigureDisplay(
   }
 
   bool success =
-      Configure(*display, static_cast<const DisplayModeDri*>(mode), origin);
+      Configure(*display, static_cast<const DrmDisplayMode*>(mode), origin);
   if (success) {
     display->set_origin(origin);
     display->set_current_mode(mode);
@@ -171,8 +171,8 @@ bool NativeDisplayDelegateDri::ConfigureDisplay(
   return success;
 }
 
-bool NativeDisplayDelegateDri::DisableDisplay(int64_t id) {
-  DisplaySnapshotDri* display = FindDisplaySnapshot(id);
+bool DrmGpuDisplayManager::DisableDisplay(int64_t id) {
+  DrmDisplaySnapshot* display = FindDisplaySnapshot(id);
   bool success = false;
   if (display)
     success = Configure(*display, NULL, gfx::Point());
@@ -182,7 +182,7 @@ bool NativeDisplayDelegateDri::DisableDisplay(int64_t id) {
   return success;
 }
 
-bool NativeDisplayDelegateDri::TakeDisplayControl() {
+bool DrmGpuDisplayManager::TakeDisplayControl() {
   for (const auto& drm : devices_) {
     if (!drm->SetMaster()) {
       LOG(ERROR) << "Failed to take control of the display";
@@ -192,7 +192,7 @@ bool NativeDisplayDelegateDri::TakeDisplayControl() {
   return true;
 }
 
-bool NativeDisplayDelegateDri::RelinquishDisplayControl() {
+bool DrmGpuDisplayManager::RelinquishDisplayControl() {
   for (const auto& drm : devices_) {
     if (!drm->DropMaster()) {
       LOG(ERROR) << "Failed to relinquish control of the display";
@@ -202,9 +202,8 @@ bool NativeDisplayDelegateDri::RelinquishDisplayControl() {
   return true;
 }
 
-void NativeDisplayDelegateDri::AddGraphicsDevice(
-    const base::FilePath& path,
-    const base::FileDescriptor& fd) {
+void DrmGpuDisplayManager::AddGraphicsDevice(const base::FilePath& path,
+                                             const base::FileDescriptor& fd) {
   base::File file(fd.fd);
   auto it =
       std::find_if(devices_.begin(), devices_.end(), FindByDevicePath(path));
@@ -225,8 +224,7 @@ void NativeDisplayDelegateDri::AddGraphicsDevice(
     device->InitializeTaskRunner(io_task_runner_);
 }
 
-void NativeDisplayDelegateDri::RemoveGraphicsDevice(
-    const base::FilePath& path) {
+void DrmGpuDisplayManager::RemoveGraphicsDevice(const base::FilePath& path) {
   auto it =
       std::find_if(devices_.begin(), devices_.end(), FindByDevicePath(path));
   if (it == devices_.end()) {
@@ -238,7 +236,7 @@ void NativeDisplayDelegateDri::RemoveGraphicsDevice(
   devices_.erase(it);
 }
 
-DisplaySnapshotDri* NativeDisplayDelegateDri::FindDisplaySnapshot(int64_t id) {
+DrmDisplaySnapshot* DrmGpuDisplayManager::FindDisplaySnapshot(int64_t id) {
   for (size_t i = 0; i < cached_displays_.size(); ++i)
     if (cached_displays_[i]->display_id() == id)
       return cached_displays_[i];
@@ -246,7 +244,7 @@ DisplaySnapshotDri* NativeDisplayDelegateDri::FindDisplaySnapshot(int64_t id) {
   return NULL;
 }
 
-const DisplayModeDri* NativeDisplayDelegateDri::FindDisplayMode(
+const DrmDisplayMode* DrmGpuDisplayManager::FindDisplayMode(
     const gfx::Size& size,
     bool is_interlaced,
     float refresh_rate) {
@@ -254,20 +252,20 @@ const DisplayModeDri* NativeDisplayDelegateDri::FindDisplayMode(
     if (cached_modes_[i]->size() == size &&
         cached_modes_[i]->is_interlaced() == is_interlaced &&
         cached_modes_[i]->refresh_rate() == refresh_rate)
-      return static_cast<const DisplayModeDri*>(cached_modes_[i]);
+      return static_cast<const DrmDisplayMode*>(cached_modes_[i]);
 
   return NULL;
 }
 
-void NativeDisplayDelegateDri::RefreshDisplayList() {
-  ScopedVector<DisplaySnapshotDri> old_displays(cached_displays_.Pass());
+void DrmGpuDisplayManager::RefreshDisplayList() {
+  ScopedVector<DrmDisplaySnapshot> old_displays(cached_displays_.Pass());
   ScopedVector<const DisplayMode> old_modes(cached_modes_.Pass());
 
   for (const auto& drm : devices_) {
     ScopedVector<HardwareDisplayControllerInfo> displays =
         GetAvailableDisplayControllerInfos(drm->get_fd());
     for (size_t i = 0; i < displays.size(); ++i) {
-      DisplaySnapshotDri* display = new DisplaySnapshotDri(
+      DrmDisplaySnapshot* display = new DrmDisplaySnapshot(
           drm, displays[i]->connector(), displays[i]->crtc(), i);
 
       // If the display exists make sure to sync up the new snapshot with the
@@ -290,9 +288,9 @@ void NativeDisplayDelegateDri::RefreshDisplayList() {
   NotifyScreenManager(cached_displays_.get(), old_displays.get());
 }
 
-bool NativeDisplayDelegateDri::Configure(const DisplaySnapshotDri& output,
-                                         const DisplayModeDri* mode,
-                                         const gfx::Point& origin) {
+bool DrmGpuDisplayManager::Configure(const DrmDisplaySnapshot& output,
+                                     const DrmDisplayMode* mode,
+                                     const gfx::Point& origin) {
   VLOG(1) << "DRM configuring: device=" << output.drm()->device_path().value()
           << " crtc=" << output.crtc() << " connector=" << output.connector()
           << " origin=" << origin.ToString()
@@ -333,8 +331,8 @@ bool NativeDisplayDelegateDri::Configure(const DisplaySnapshotDri& output,
   return true;
 }
 
-bool NativeDisplayDelegateDri::GetHDCPState(const DisplaySnapshotDri& output,
-                                            HDCPState* state) {
+bool DrmGpuDisplayManager::GetHDCPState(const DrmDisplaySnapshot& output,
+                                        HDCPState* state) {
   ScopedDrmConnectorPtr connector(
       output.drm()->GetConnector(output.connector()));
   if (!connector) {
@@ -366,8 +364,8 @@ bool NativeDisplayDelegateDri::GetHDCPState(const DisplaySnapshotDri& output,
   return false;
 }
 
-bool NativeDisplayDelegateDri::SetHDCPState(const DisplaySnapshotDri& output,
-                                            HDCPState state) {
+bool DrmGpuDisplayManager::SetHDCPState(const DrmDisplaySnapshot& output,
+                                        HDCPState state) {
   ScopedDrmConnectorPtr connector(
       output.drm()->GetConnector(output.connector()));
   if (!connector) {
@@ -387,11 +385,11 @@ bool NativeDisplayDelegateDri::SetHDCPState(const DisplaySnapshotDri& output,
       GetContentProtectionValue(hdcp_property.get(), state));
 }
 
-void NativeDisplayDelegateDri::NotifyScreenManager(
-    const std::vector<DisplaySnapshotDri*>& new_displays,
-    const std::vector<DisplaySnapshotDri*>& old_displays) const {
+void DrmGpuDisplayManager::NotifyScreenManager(
+    const std::vector<DrmDisplaySnapshot*>& new_displays,
+    const std::vector<DrmDisplaySnapshot*>& old_displays) const {
   for (size_t i = 0; i < old_displays.size(); ++i) {
-    const std::vector<DisplaySnapshotDri*>::const_iterator it =
+    const std::vector<DrmDisplaySnapshot*>::const_iterator it =
         std::find_if(new_displays.begin(), new_displays.end(),
                      DisplaySnapshotComparator(old_displays[i]));
 
@@ -402,7 +400,7 @@ void NativeDisplayDelegateDri::NotifyScreenManager(
   }
 
   for (size_t i = 0; i < new_displays.size(); ++i) {
-    const std::vector<DisplaySnapshotDri*>::const_iterator it =
+    const std::vector<DrmDisplaySnapshot*>::const_iterator it =
         std::find_if(old_displays.begin(), old_displays.end(),
                      DisplaySnapshotComparator(new_displays[i]));
 
diff --git a/ui/ozone/platform/dri/native_display_delegate_dri.h b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h
index 55c554c..bbfa508 100644
--- a/ui/ozone/platform/dri/native_display_delegate_dri.h
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_DRI_H_
-#define UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_DRI_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -19,19 +19,19 @@ struct FileDescriptor;
 namespace ui {
 
 class DeviceManager;
-class DisplaySnapshotDri;
 class DisplayMode;
-class DisplayModeDri;
 class DrmDevice;
 class DrmDeviceGenerator;
+class DrmDisplaySnapshot;
+class DrmDisplayMode;
 class ScreenManager;
 
-class NativeDisplayDelegateDri {
+class DrmGpuDisplayManager {
  public:
-  NativeDisplayDelegateDri(ScreenManager* screen_manager,
-                           const scoped_refptr<DrmDevice>& primary_device,
-                           scoped_ptr<DrmDeviceGenerator> device_generator);
-  ~NativeDisplayDelegateDri();
+  DrmGpuDisplayManager(ScreenManager* screen_manager,
+                       const scoped_refptr<DrmDevice>& primary_device,
+                       scoped_ptr<DrmDeviceGenerator> device_generator);
+  ~DrmGpuDisplayManager();
 
   void InitializeIOTaskRunner(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
@@ -55,24 +55,24 @@ class NativeDisplayDelegateDri {
   void RemoveGraphicsDevice(const base::FilePath& path);
 
  private:
-  DisplaySnapshotDri* FindDisplaySnapshot(int64_t id);
-  const DisplayModeDri* FindDisplayMode(const gfx::Size& size,
+  DrmDisplaySnapshot* FindDisplaySnapshot(int64_t id);
+  const DrmDisplayMode* FindDisplayMode(const gfx::Size& size,
                                         bool is_interlaced,
                                         float refresh_rate);
 
   void RefreshDisplayList();
-  bool Configure(const DisplaySnapshotDri& output,
-                 const DisplayModeDri* mode,
+  bool Configure(const DrmDisplaySnapshot& output,
+                 const DrmDisplayMode* mode,
                  const gfx::Point& origin);
 
-  bool GetHDCPState(const DisplaySnapshotDri& output, HDCPState* state);
-  bool SetHDCPState(const DisplaySnapshotDri& output, HDCPState state);
+  bool GetHDCPState(const DrmDisplaySnapshot& output, HDCPState* state);
+  bool SetHDCPState(const DrmDisplaySnapshot& output, HDCPState state);
 
   // Notify ScreenManager of all the displays that were present before the
   // update but are gone after the update.
   void NotifyScreenManager(
-      const std::vector<DisplaySnapshotDri*>& new_displays,
-      const std::vector<DisplaySnapshotDri*>& old_displays) const;
+      const std::vector<DrmDisplaySnapshot*>& new_displays,
+      const std::vector<DrmDisplaySnapshot*>& old_displays) const;
 
   ScreenManager* screen_manager_;  // Not owned.
   scoped_ptr<DrmDeviceGenerator> drm_device_generator_;
@@ -81,11 +81,11 @@ class NativeDisplayDelegateDri {
   // Modes can be shared between different displays, so we need to keep track
   // of them independently for cleanup.
   ScopedVector<const DisplayMode> cached_modes_;
-  ScopedVector<DisplaySnapshotDri> cached_displays_;
+  ScopedVector<DrmDisplaySnapshot> cached_displays_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateDri);
+  DISALLOW_COPY_AND_ASSIGN(DrmGpuDisplayManager);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_DRI_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_DISPLAY_MANAGER_H_
diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support.cc b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
index a67d42a..58dfe35 100644
--- a/ui/ozone/platform/dri/dri_gpu_platform_support.cc
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
 
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/native_display_delegate_dri.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
 
 namespace ui {
 
@@ -24,14 +24,14 @@ void MessageProcessedOnMain(
   io_thread_task_runner->PostTask(FROM_HERE, io_thread_task);
 }
 
-class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
+class DrmGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
  public:
   typedef base::Callback<void(
       const scoped_refptr<base::SingleThreadTaskRunner>&)>
       OnFilterAddedCallback;
 
-  DriGpuPlatformSupportMessageFilter(
-      DriWindowDelegateManager* window_manager,
+  DrmGpuPlatformSupportMessageFilter(
+      DrmWindowManager* window_manager,
       const OnFilterAddedCallback& on_filter_added_callback,
       IPC::Listener* main_thread_listener)
       : window_manager_(window_manager),
@@ -80,7 +80,7 @@ class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
       // When the main thread is done with the task, it posts back to IO to
       // signal completion.
       base::Closure io_thread_task = base::Bind(
-          &DriGpuPlatformSupportMessageFilter::DecrementPendingOperationsOnIO,
+          &DrmGpuPlatformSupportMessageFilter::DecrementPendingOperationsOnIO,
           this);
 
       base::Closure message_processed_callback = base::Bind(
@@ -92,7 +92,7 @@ class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
 
     // Otherwise, we are in a steady state and it's safe to move cursor on IO.
     bool handled = true;
-    IPC_BEGIN_MESSAGE_MAP(DriGpuPlatformSupportMessageFilter, message)
+    IPC_BEGIN_MESSAGE_MAP(DrmGpuPlatformSupportMessageFilter, message)
     IPC_MESSAGE_HANDLER(OzoneGpuMsg_CursorMove, OnCursorMove)
     IPC_MESSAGE_HANDLER(OzoneGpuMsg_CursorSet, OnCursorSet)
     IPC_MESSAGE_UNHANDLED(handled = false);
@@ -102,7 +102,7 @@ class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
   }
 
  protected:
-  ~DriGpuPlatformSupportMessageFilter() override {}
+  ~DrmGpuPlatformSupportMessageFilter() override {}
 
   void OnCursorMove(gfx::AcceleratedWidget widget, const gfx::Point& location) {
     window_manager_->GetWindowDelegate(widget)->MoveCursor(location);
@@ -153,7 +153,7 @@ class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
     cursor_animating_ = frame_delay_ms != 0;
   }
 
-  DriWindowDelegateManager* window_manager_;
+  DrmWindowManager* window_manager_;
   OnFilterAddedCallback on_filter_added_callback_;
   IPC::Listener* main_thread_listener_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
@@ -163,40 +163,40 @@ class DriGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
 };
 }
 
-DriGpuPlatformSupport::DriGpuPlatformSupport(
+DrmGpuPlatformSupport::DrmGpuPlatformSupport(
     DrmDeviceManager* drm_device_manager,
-    DriWindowDelegateManager* window_manager,
+    DrmWindowManager* window_manager,
     ScreenManager* screen_manager,
-    scoped_ptr<NativeDisplayDelegateDri> ndd)
+    scoped_ptr<DrmGpuDisplayManager> ndd)
     : sender_(NULL),
       drm_device_manager_(drm_device_manager),
       window_manager_(window_manager),
       screen_manager_(screen_manager),
       ndd_(ndd.Pass()) {
-  filter_ = new DriGpuPlatformSupportMessageFilter(
-      window_manager, base::Bind(&DriGpuPlatformSupport::SetIOTaskRunner,
+  filter_ = new DrmGpuPlatformSupportMessageFilter(
+      window_manager, base::Bind(&DrmGpuPlatformSupport::SetIOTaskRunner,
                                  base::Unretained(this)),
       this);
 }
 
-DriGpuPlatformSupport::~DriGpuPlatformSupport() {
+DrmGpuPlatformSupport::~DrmGpuPlatformSupport() {
 }
 
-void DriGpuPlatformSupport::AddHandler(scoped_ptr<GpuPlatformSupport> handler) {
+void DrmGpuPlatformSupport::AddHandler(scoped_ptr<GpuPlatformSupport> handler) {
   handlers_.push_back(handler.release());
 }
 
-void DriGpuPlatformSupport::OnChannelEstablished(IPC::Sender* sender) {
+void DrmGpuPlatformSupport::OnChannelEstablished(IPC::Sender* sender) {
   sender_ = sender;
 
   for (size_t i = 0; i < handlers_.size(); ++i)
     handlers_[i]->OnChannelEstablished(sender);
 }
 
-bool DriGpuPlatformSupport::OnMessageReceived(const IPC::Message& message) {
+bool DrmGpuPlatformSupport::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
 
-  IPC_BEGIN_MESSAGE_MAP(DriGpuPlatformSupport, message)
+  IPC_BEGIN_MESSAGE_MAP(DrmGpuPlatformSupport, message)
   IPC_MESSAGE_HANDLER(OzoneGpuMsg_CreateWindowDelegate, OnCreateWindowDelegate)
   IPC_MESSAGE_HANDLER(OzoneGpuMsg_DestroyWindowDelegate,
                       OnDestroyWindowDelegate)
@@ -226,27 +226,27 @@ bool DriGpuPlatformSupport::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
-void DriGpuPlatformSupport::OnCreateWindowDelegate(
+void DrmGpuPlatformSupport::OnCreateWindowDelegate(
     gfx::AcceleratedWidget widget) {
-  scoped_ptr<DriWindowDelegate> delegate(
-      new DriWindowDelegate(widget, drm_device_manager_, screen_manager_));
+  scoped_ptr<DrmWindow> delegate(
+      new DrmWindow(widget, drm_device_manager_, screen_manager_));
   delegate->Initialize();
   window_manager_->AddWindowDelegate(widget, delegate.Pass());
 }
 
-void DriGpuPlatformSupport::OnDestroyWindowDelegate(
+void DrmGpuPlatformSupport::OnDestroyWindowDelegate(
     gfx::AcceleratedWidget widget) {
-  scoped_ptr<DriWindowDelegate> delegate =
+  scoped_ptr<DrmWindow> delegate =
       window_manager_->RemoveWindowDelegate(widget);
   delegate->Shutdown();
 }
 
-void DriGpuPlatformSupport::OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
+void DrmGpuPlatformSupport::OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
                                                   const gfx::Rect& bounds) {
   window_manager_->GetWindowDelegate(widget)->OnBoundsChanged(bounds);
 }
 
-void DriGpuPlatformSupport::OnCursorSet(gfx::AcceleratedWidget widget,
+void DrmGpuPlatformSupport::OnCursorSet(gfx::AcceleratedWidget widget,
                                         const std::vector<SkBitmap>& bitmaps,
                                         const gfx::Point& location,
                                         int frame_delay_ms) {
@@ -254,16 +254,16 @@ void DriGpuPlatformSupport::OnCursorSet(gfx::AcceleratedWidget widget,
       ->SetCursor(bitmaps, location, frame_delay_ms);
 }
 
-void DriGpuPlatformSupport::OnCursorMove(gfx::AcceleratedWidget widget,
+void DrmGpuPlatformSupport::OnCursorMove(gfx::AcceleratedWidget widget,
                                          const gfx::Point& location) {
   window_manager_->GetWindowDelegate(widget)->MoveCursor(location);
 }
 
-void DriGpuPlatformSupport::OnRefreshNativeDisplays() {
+void DrmGpuPlatformSupport::OnRefreshNativeDisplays() {
   sender_->Send(new OzoneHostMsg_UpdateNativeDisplays(ndd_->GetDisplays()));
 }
 
-void DriGpuPlatformSupport::OnConfigureNativeDisplay(
+void DrmGpuPlatformSupport::OnConfigureNativeDisplay(
     int64_t id,
     const DisplayMode_Params& mode_param,
     const gfx::Point& origin) {
@@ -271,40 +271,40 @@ void DriGpuPlatformSupport::OnConfigureNativeDisplay(
       id, ndd_->ConfigureDisplay(id, mode_param, origin)));
 }
 
-void DriGpuPlatformSupport::OnDisableNativeDisplay(int64_t id) {
+void DrmGpuPlatformSupport::OnDisableNativeDisplay(int64_t id) {
   sender_->Send(
       new OzoneHostMsg_DisplayConfigured(id, ndd_->DisableDisplay(id)));
 }
 
-void DriGpuPlatformSupport::OnTakeDisplayControl() {
+void DrmGpuPlatformSupport::OnTakeDisplayControl() {
   ndd_->TakeDisplayControl();
 }
 
-void DriGpuPlatformSupport::OnRelinquishDisplayControl() {
+void DrmGpuPlatformSupport::OnRelinquishDisplayControl() {
   ndd_->RelinquishDisplayControl();
 }
 
-void DriGpuPlatformSupport::OnAddGraphicsDevice(
+void DrmGpuPlatformSupport::OnAddGraphicsDevice(
     const base::FilePath& path,
     const base::FileDescriptor& fd) {
   ndd_->AddGraphicsDevice(path, fd);
 }
 
-void DriGpuPlatformSupport::OnRemoveGraphicsDevice(const base::FilePath& path) {
+void DrmGpuPlatformSupport::OnRemoveGraphicsDevice(const base::FilePath& path) {
   ndd_->RemoveGraphicsDevice(path);
 }
 
-void DriGpuPlatformSupport::RelinquishGpuResources(
+void DrmGpuPlatformSupport::RelinquishGpuResources(
     const base::Closure& callback) {
   callback.Run();
 }
 
-void DriGpuPlatformSupport::SetIOTaskRunner(
+void DrmGpuPlatformSupport::SetIOTaskRunner(
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) {
   ndd_->InitializeIOTaskRunner(io_task_runner);
 }
 
-IPC::MessageFilter* DriGpuPlatformSupport::GetMessageFilter() {
+IPC::MessageFilter* DrmGpuPlatformSupport::GetMessageFilter() {
   return filter_.get();
 }
 
diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support.h b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h
index afe1403..046a4ae 100644
--- a/ui/ozone/platform/dri/dri_gpu_platform_support.h
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
@@ -27,23 +27,23 @@ class Rect;
 
 namespace ui {
 
-class DriSurfaceFactory;
-class DriWindowDelegate;
-class DriWindowDelegateManager;
 class DrmDeviceManager;
-class NativeDisplayDelegateDri;
+class DrmGpuDisplayManager;
+class DrmSurfaceFactory;
+class DrmWindow;
+class DrmWindowManager;
 class ScreenManager;
 
 struct DisplayMode_Params;
 struct DisplaySnapshot_Params;
 
-class DriGpuPlatformSupport : public GpuPlatformSupport {
+class DrmGpuPlatformSupport : public GpuPlatformSupport {
  public:
-  DriGpuPlatformSupport(DrmDeviceManager* drm_device_manager,
-                        DriWindowDelegateManager* window_manager,
+  DrmGpuPlatformSupport(DrmDeviceManager* drm_device_manager,
+                        DrmWindowManager* window_manager,
                         ScreenManager* screen_manager,
-                        scoped_ptr<NativeDisplayDelegateDri> ndd);
-  ~DriGpuPlatformSupport() override;
+                        scoped_ptr<DrmGpuDisplayManager> ndd);
+  ~DrmGpuPlatformSupport() override;
 
   void AddHandler(scoped_ptr<GpuPlatformSupport> handler);
 
@@ -81,16 +81,16 @@ class DriGpuPlatformSupport : public GpuPlatformSupport {
   void SetIOTaskRunner(
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
 
-  IPC::Sender* sender_;                       // Not owned.
-  DrmDeviceManager* drm_device_manager_;      // Not owned.
-  DriWindowDelegateManager* window_manager_;  // Not owned.
-  ScreenManager* screen_manager_;             // Not owned.
+  IPC::Sender* sender_;                   // Not owned.
+  DrmDeviceManager* drm_device_manager_;  // Not owned.
+  DrmWindowManager* window_manager_;      // Not owned.
+  ScreenManager* screen_manager_;         // Not owned.
 
-  scoped_ptr<NativeDisplayDelegateDri> ndd_;
+  scoped_ptr<DrmGpuDisplayManager> ndd_;
   ScopedVector<GpuPlatformSupport> handlers_;
   scoped_refptr<IPC::MessageFilter> filter_;
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_GPU_PLATFORM_SUPPORT_H_
diff --git a/ui/ozone/platform/dri/dri_surface.cc b/ui/ozone/platform/drm/gpu/drm_surface.cc
index 2bc85a3..466441e 100644
--- a/ui/ozone/platform/dri/dri_surface.cc
+++ b/ui/ozone/platform/drm/gpu/drm_surface.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_surface.h"
+#include "ui/ozone/platform/drm/gpu/drm_surface.h"
 
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ -11,19 +11,19 @@
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_vsync_provider.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 namespace ui {
 
 namespace {
 
-scoped_refptr<DriBuffer> AllocateBuffer(const scoped_refptr<DrmDevice>& drm,
+scoped_refptr<DrmBuffer> AllocateBuffer(const scoped_refptr<DrmDevice>& drm,
                                         const gfx::Size& size) {
-  scoped_refptr<DriBuffer> buffer(new DriBuffer(drm));
+  scoped_refptr<DrmBuffer> buffer(new DrmBuffer(drm));
   SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
 
   bool initialized =
@@ -35,18 +35,18 @@ scoped_refptr<DriBuffer> AllocateBuffer(const scoped_refptr<DrmDevice>& drm,
 
 }  // namespace
 
-DriSurface::DriSurface(DriWindowDelegate* window_delegate)
+DrmSurface::DrmSurface(DrmWindow* window_delegate)
     : window_delegate_(window_delegate), buffers_(), front_buffer_(0) {
 }
 
-DriSurface::~DriSurface() {
+DrmSurface::~DrmSurface() {
 }
 
-skia::RefPtr<SkSurface> DriSurface::GetSurface() {
+skia::RefPtr<SkSurface> DrmSurface::GetSurface() {
   return surface_;
 }
 
-void DriSurface::ResizeCanvas(const gfx::Size& viewport_size) {
+void DrmSurface::ResizeCanvas(const gfx::Size& viewport_size) {
   SkImageInfo info = SkImageInfo::MakeN32(
       viewport_size.width(), viewport_size.height(), kOpaque_SkAlphaType);
   surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
@@ -62,7 +62,7 @@ void DriSurface::ResizeCanvas(const gfx::Size& viewport_size) {
                                  controller->GetModeSize());
 }
 
-void DriSurface::PresentCanvas(const gfx::Rect& damage) {
+void DrmSurface::PresentCanvas(const gfx::Rect& damage) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   HardwareDisplayController* controller = window_delegate_->GetController();
@@ -80,14 +80,14 @@ void DriSurface::PresentCanvas(const gfx::Rect& damage) {
   front_buffer_ ^= 1;
 }
 
-scoped_ptr<gfx::VSyncProvider> DriSurface::CreateVSyncProvider() {
-  return make_scoped_ptr(new DriVSyncProvider(window_delegate_));
+scoped_ptr<gfx::VSyncProvider> DrmSurface::CreateVSyncProvider() {
+  return make_scoped_ptr(new DrmVSyncProvider(window_delegate_));
 }
 
-void DriSurface::UpdateNativeSurface(const gfx::Rect& damage) {
+void DrmSurface::UpdateNativeSurface(const gfx::Rect& damage) {
   SkCanvas* canvas = buffers_[front_buffer_ ^ 1]->GetCanvas();
 
-  // The DriSurface is double buffered, so the current back buffer is
+  // The DrmSurface is double buffered, so the current back buffer is
   // missing the previous update. Expand damage region.
   SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_));
 
diff --git a/ui/ozone/platform/dri/dri_surface.h b/ui/ozone/platform/drm/gpu/drm_surface.h
index e7e0d51..efb0f8a 100644
--- a/ui/ozone/platform/dri/dri_surface.h
+++ b/ui/ozone/platform/drm/gpu/drm_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_SURFACE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_SURFACE_H_
 
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/geometry/rect.h"
@@ -16,14 +16,14 @@ class SkSurface;
 
 namespace ui {
 
-class DriBuffer;
-class DriWindowDelegate;
+class DrmBuffer;
+class DrmWindow;
 class HardwareDisplayController;
 
-class OZONE_EXPORT DriSurface : public SurfaceOzoneCanvas {
+class OZONE_EXPORT DrmSurface : public SurfaceOzoneCanvas {
  public:
-  DriSurface(DriWindowDelegate* window_delegate);
-  ~DriSurface() override;
+  DrmSurface(DrmWindow* window_delegate);
+  ~DrmSurface() override;
 
   // SurfaceOzoneCanvas:
   skia::RefPtr<SkSurface> GetSurface() override;
@@ -34,10 +34,10 @@ class OZONE_EXPORT DriSurface : public SurfaceOzoneCanvas {
  private:
   void UpdateNativeSurface(const gfx::Rect& damage);
 
-  DriWindowDelegate* window_delegate_;
+  DrmWindow* window_delegate_;
 
   // The actual buffers used for painting.
-  scoped_refptr<DriBuffer> buffers_[2];
+  scoped_refptr<DrmBuffer> buffers_[2];
 
   // Keeps track of which bitmap is |buffers_| is the frontbuffer.
   int front_buffer_;
@@ -45,9 +45,9 @@ class OZONE_EXPORT DriSurface : public SurfaceOzoneCanvas {
   skia::RefPtr<SkSurface> surface_;
   gfx::Rect last_damage_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriSurface);
+  DISALLOW_COPY_AND_ASSIGN(DrmSurface);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_SURFACE_H_
diff --git a/ui/ozone/platform/dri/dri_surface_unittest.cc b/ui/ozone/platform/drm/gpu/drm_surface_unittest.cc
index 7a5b8c5..59453c4 100644
--- a/ui/ozone/platform/dri/dri_surface_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_surface_unittest.cc
@@ -7,14 +7,14 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_surface.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_surface.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 
 namespace {
 
@@ -30,9 +30,9 @@ const uint32_t kDefaultCursorSize = 64;
 
 }  // namespace
 
-class DriSurfaceTest : public testing::Test {
+class DrmSurfaceTest : public testing::Test {
  public:
-  DriSurfaceTest() {}
+  DrmSurfaceTest() {}
 
   void SetUp() override;
   void TearDown() override;
@@ -40,47 +40,47 @@ class DriSurfaceTest : public testing::Test {
  protected:
   scoped_ptr<base::MessageLoop> message_loop_;
   scoped_refptr<ui::MockDrmDevice> drm_;
-  scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
+  scoped_ptr<ui::DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ui::ScreenManager> screen_manager_;
   scoped_ptr<ui::DrmDeviceManager> drm_device_manager_;
-  scoped_ptr<ui::DriWindowDelegate> window_delegate_;
-  scoped_ptr<ui::DriSurface> surface_;
+  scoped_ptr<ui::DrmWindow> window_delegate_;
+  scoped_ptr<ui::DrmSurface> surface_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DriSurfaceTest);
+  DISALLOW_COPY_AND_ASSIGN(DrmSurfaceTest);
 };
 
-void DriSurfaceTest::SetUp() {
+void DrmSurfaceTest::SetUp() {
   message_loop_.reset(new base::MessageLoopForUI);
   std::vector<uint32_t> crtcs;
   crtcs.push_back(kDefaultCrtc);
   drm_ = new ui::MockDrmDevice(true, crtcs, kPlanesPerCrtc);
-  buffer_generator_.reset(new ui::DriBufferGenerator());
+  buffer_generator_.reset(new ui::DrmBufferGenerator());
   screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
   screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector);
   screen_manager_->ConfigureDisplayController(
       drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
 
   drm_device_manager_.reset(new ui::DrmDeviceManager(drm_));
-  window_delegate_.reset(new ui::DriWindowDelegate(
+  window_delegate_.reset(new ui::DrmWindow(
       kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get()));
   window_delegate_->Initialize();
   window_delegate_->OnBoundsChanged(
       gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
 
-  surface_.reset(new ui::DriSurface(window_delegate_.get()));
-  surface_->ResizeCanvas(gfx::Size(kDefaultMode.hdisplay,
-                                   kDefaultMode.vdisplay));
+  surface_.reset(new ui::DrmSurface(window_delegate_.get()));
+  surface_->ResizeCanvas(
+      gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay));
 }
 
-void DriSurfaceTest::TearDown() {
+void DrmSurfaceTest::TearDown() {
   surface_.reset();
   window_delegate_->Shutdown();
   drm_ = nullptr;
   message_loop_.reset();
 }
 
-TEST_F(DriSurfaceTest, CheckFBIDOnSwap) {
+TEST_F(DrmSurfaceTest, CheckFBIDOnSwap) {
   surface_->PresentCanvas(gfx::Rect());
   // Framebuffer ID 1 is allocated in SetUp for the buffer used to modeset.
   EXPECT_EQ(3u, drm_->current_framebuffer());
@@ -88,11 +88,11 @@ TEST_F(DriSurfaceTest, CheckFBIDOnSwap) {
   EXPECT_EQ(2u, drm_->current_framebuffer());
 }
 
-TEST_F(DriSurfaceTest, CheckSurfaceContents) {
+TEST_F(DrmSurfaceTest, CheckSurfaceContents) {
   SkPaint paint;
   paint.setColor(SK_ColorWHITE);
-  SkRect rect = SkRect::MakeWH(kDefaultMode.hdisplay / 2,
-                               kDefaultMode.vdisplay / 2);
+  SkRect rect =
+      SkRect::MakeWH(kDefaultMode.hdisplay / 2, kDefaultMode.vdisplay / 2);
   surface_->GetSurface()->getCanvas()->drawRect(rect, paint);
   surface_->PresentCanvas(
       gfx::Rect(0, 0, kDefaultMode.hdisplay / 2, kDefaultMode.vdisplay / 2));
diff --git a/ui/ozone/platform/dri/dri_util.cc b/ui/ozone/platform/drm/gpu/drm_util.cc
index 338c411..6c96d11 100644
--- a/ui/ozone/platform/dri/dri_util.cc
+++ b/ui/ozone/platform/drm/gpu/drm_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_util.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -13,8 +13,8 @@
 #include <xf86drmMode.h>
 
 #include "base/strings/stringprintf.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
 
 namespace ui {
 
@@ -67,20 +67,21 @@ uint32_t GetCrtc(int fd,
 HardwareDisplayControllerInfo::HardwareDisplayControllerInfo(
     ScopedDrmConnectorPtr connector,
     ScopedDrmCrtcPtr crtc)
-    : connector_(connector.Pass()),
-      crtc_(crtc.Pass()) {}
+    : connector_(connector.Pass()), crtc_(crtc.Pass()) {
+}
 
-HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() {}
+HardwareDisplayControllerInfo::~HardwareDisplayControllerInfo() {
+}
 
-ScopedVector<HardwareDisplayControllerInfo>
-GetAvailableDisplayControllerInfos(int fd) {
+ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
+    int fd) {
   ScopedDrmResourcesPtr resources(drmModeGetResources(fd));
   DCHECK(resources) << "Failed to get DRM resources";
   ScopedVector<HardwareDisplayControllerInfo> displays;
 
   for (int i = 0; i < resources->count_connectors; ++i) {
-    ScopedDrmConnectorPtr connector(drmModeGetConnector(
-        fd, resources->connectors[i]));
+    ScopedDrmConnectorPtr connector(
+        drmModeGetConnector(fd, resources->connectors[i]));
 
     if (!connector || connector->connection != DRM_MODE_CONNECTED ||
         connector->count_modes == 0)
@@ -91,34 +92,24 @@ GetAvailableDisplayControllerInfos(int fd) {
       continue;
 
     ScopedDrmCrtcPtr crtc(drmModeGetCrtc(fd, crtc_id));
-    displays.push_back(new HardwareDisplayControllerInfo(connector.Pass(),
-                                                         crtc.Pass()));
+    displays.push_back(
+        new HardwareDisplayControllerInfo(connector.Pass(), crtc.Pass()));
   }
 
   return displays.Pass();
 }
 
 bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs) {
-  return lhs.clock == rhs.clock &&
-         lhs.hdisplay == rhs.hdisplay &&
-         lhs.vdisplay == rhs.vdisplay &&
-         lhs.vrefresh == rhs.vrefresh &&
-         lhs.hsync_start == rhs.hsync_start &&
-         lhs.hsync_end == rhs.hsync_end &&
-         lhs.htotal == rhs.htotal &&
-         lhs.hskew == rhs.hskew &&
-         lhs.vsync_start == rhs.vsync_start &&
-         lhs.vsync_end == rhs.vsync_end &&
-         lhs.vtotal == rhs.vtotal &&
-         lhs.vscan == rhs.vscan &&
-         lhs.flags == rhs.flags &&
-         strcmp(lhs.name, rhs.name) == 0;
+  return lhs.clock == rhs.clock && lhs.hdisplay == rhs.hdisplay &&
+         lhs.vdisplay == rhs.vdisplay && lhs.vrefresh == rhs.vrefresh &&
+         lhs.hsync_start == rhs.hsync_start && lhs.hsync_end == rhs.hsync_end &&
+         lhs.htotal == rhs.htotal && lhs.hskew == rhs.hskew &&
+         lhs.vsync_start == rhs.vsync_start && lhs.vsync_end == rhs.vsync_end &&
+         lhs.vtotal == rhs.vtotal && lhs.vscan == rhs.vscan &&
+         lhs.flags == rhs.flags && strcmp(lhs.name, rhs.name) == 0;
 }
 
-bool MapDumbBuffer(int fd,
-                   uint32_t handle,
-                   uint32_t size,
-                   void** pixels) {
+bool MapDumbBuffer(int fd, uint32_t handle, uint32_t size, void** pixels) {
   struct drm_mode_map_dumb map_request;
   memset(&map_request, 0, sizeof(map_request));
   map_request.handle = handle;
@@ -128,12 +119,8 @@ bool MapDumbBuffer(int fd,
     return false;
   }
 
-  *pixels = mmap(0,
-                 size,
-                 PROT_READ | PROT_WRITE,
-                 MAP_SHARED,
-                 fd,
-                 map_request.offset);
+  *pixels =
+      mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, map_request.offset);
   if (*pixels == MAP_FAILED) {
     VLOG(2) << "Cannot mmap dumb buffer (" << errno << ") " << strerror(errno);
     return false;
diff --git a/ui/ozone/platform/dri/dri_util.h b/ui/ozone/platform/drm/gpu/drm_util.h
index eb83939..a15a60f 100644
--- a/ui/ozone/platform/dri/dri_util.h
+++ b/ui/ozone/platform/drm/gpu/drm_util.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_UTIL_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_UTIL_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 typedef struct _drmModeModeInfo drmModeModeInfo;
 
@@ -38,16 +38,13 @@ class HardwareDisplayControllerInfo {
 
 // Looks-up and parses the native display configurations returning all available
 // displays.
-ScopedVector<HardwareDisplayControllerInfo>
-GetAvailableDisplayControllerInfos(int fd);
+ScopedVector<HardwareDisplayControllerInfo> GetAvailableDisplayControllerInfos(
+    int fd);
 
 bool SameMode(const drmModeModeInfo& lhs, const drmModeModeInfo& rhs);
 
 // Memory maps a DRM buffer.
-bool MapDumbBuffer(int fd,
-                   uint32_t handle,
-                   uint32_t size,
-                   void** pixels);
+bool MapDumbBuffer(int fd, uint32_t handle, uint32_t size, void** pixels);
 
 void ForceInitializationOfPrimaryDisplay(const scoped_refptr<DrmDevice>& drm,
                                          ScreenManager* screen_manager);
@@ -56,4 +53,4 @@ base::FilePath GetPrimaryDisplayCardPath();
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_UTIL_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_UTIL_H_
diff --git a/ui/ozone/platform/dri/dri_vsync_provider.cc b/ui/ozone/platform/drm/gpu/drm_vsync_provider.cc
index bf88c5d..bb846b5 100644
--- a/ui/ozone/platform/dri/dri_vsync_provider.cc
+++ b/ui/ozone/platform/drm/gpu/drm_vsync_provider.cc
@@ -2,21 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_vsync_provider.h"
+#include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
 
 #include "base/time/time.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 namespace ui {
 
-DriVSyncProvider::DriVSyncProvider(DriWindowDelegate* window_delegate)
+DrmVSyncProvider::DrmVSyncProvider(DrmWindow* window_delegate)
     : window_delegate_(window_delegate) {
 }
 
-DriVSyncProvider::~DriVSyncProvider() {}
+DrmVSyncProvider::~DrmVSyncProvider() {
+}
 
-void DriVSyncProvider::GetVSyncParameters(const UpdateVSyncCallback& callback) {
+void DrmVSyncProvider::GetVSyncParameters(const UpdateVSyncCallback& callback) {
   HardwareDisplayController* controller = window_delegate_->GetController();
   if (!controller)
     return;
diff --git a/ui/ozone/platform/drm/gpu/drm_vsync_provider.h b/ui/ozone/platform/drm/gpu/drm_vsync_provider.h
new file mode 100644
index 0000000..dba2980
--- /dev/null
+++ b/ui/ozone/platform/drm/gpu/drm_vsync_provider.h
@@ -0,0 +1,29 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_OZONE_PLATFORM_IMPL_DRM_VSYNC_PROVIDER_H_
+#define UI_OZONE_PLATFORM_IMPL_DRM_VSYNC_PROVIDER_H_
+
+#include "ui/gfx/vsync_provider.h"
+
+namespace ui {
+
+class DrmWindow;
+
+class DrmVSyncProvider : public gfx::VSyncProvider {
+ public:
+  DrmVSyncProvider(DrmWindow* window_delegate);
+  ~DrmVSyncProvider() override;
+
+  void GetVSyncParameters(const UpdateVSyncCallback& callback) override;
+
+ private:
+  DrmWindow* window_delegate_;  // Not owned.
+
+  DISALLOW_COPY_AND_ASSIGN(DrmVSyncProvider);
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_IMPL_DRM_VSYNC_PROVIDER_H_
diff --git a/ui/ozone/platform/dri/dri_window_delegate.cc b/ui/ozone/platform/drm/gpu/drm_window.cc
index ddc1e18..0e8ad28 100644
--- a/ui/ozone/platform/dri/dri_window_delegate.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
 
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
 
 namespace ui {
 
@@ -25,7 +25,7 @@ namespace {
 #define DRM_CAP_CURSOR_HEIGHT 0x9
 #endif
 
-void UpdateCursorImage(DriBuffer* cursor, const SkBitmap& image) {
+void UpdateCursorImage(DrmBuffer* cursor, const SkBitmap& image) {
   SkRect damage;
   image.getBounds(&damage);
 
@@ -42,9 +42,9 @@ void UpdateCursorImage(DriBuffer* cursor, const SkBitmap& image) {
 
 }  // namespace
 
-DriWindowDelegate::DriWindowDelegate(gfx::AcceleratedWidget widget,
-                                     DrmDeviceManager* device_manager,
-                                     ScreenManager* screen_manager)
+DrmWindow::DrmWindow(gfx::AcceleratedWidget widget,
+                     DrmDeviceManager* device_manager,
+                     ScreenManager* screen_manager)
     : widget_(widget),
       device_manager_(device_manager),
       screen_manager_(screen_manager),
@@ -54,42 +54,42 @@ DriWindowDelegate::DriWindowDelegate(gfx::AcceleratedWidget widget,
       cursor_frame_delay_ms_(0) {
 }
 
-DriWindowDelegate::~DriWindowDelegate() {
+DrmWindow::~DrmWindow() {
 }
 
-void DriWindowDelegate::Initialize() {
-  TRACE_EVENT1("dri", "DriWindowDelegate::Initialize", "widget", widget_);
+void DrmWindow::Initialize() {
+  TRACE_EVENT1("drm", "DrmWindow::Initialize", "widget", widget_);
 
   device_manager_->UpdateDrmDevice(widget_, nullptr);
   screen_manager_->AddObserver(this);
 }
 
-void DriWindowDelegate::Shutdown() {
-  TRACE_EVENT1("dri", "DriWindowDelegate::Shutdown", "widget", widget_);
+void DrmWindow::Shutdown() {
+  TRACE_EVENT1("drm", "DrmWindow::Shutdown", "widget", widget_);
   screen_manager_->RemoveObserver(this);
   device_manager_->RemoveDrmDevice(widget_);
 }
 
-gfx::AcceleratedWidget DriWindowDelegate::GetAcceleratedWidget() {
+gfx::AcceleratedWidget DrmWindow::GetAcceleratedWidget() {
   return widget_;
 }
 
-HardwareDisplayController* DriWindowDelegate::GetController() {
+HardwareDisplayController* DrmWindow::GetController() {
   return controller_;
 }
 
-void DriWindowDelegate::OnBoundsChanged(const gfx::Rect& bounds) {
-  TRACE_EVENT2("dri", "DriWindowDelegate::OnBoundsChanged", "widget", widget_,
-               "bounds", bounds.ToString());
+void DrmWindow::OnBoundsChanged(const gfx::Rect& bounds) {
+  TRACE_EVENT2("drm", "DrmWindow::OnBoundsChanged", "widget", widget_, "bounds",
+               bounds.ToString());
   bounds_ = bounds;
   controller_ = screen_manager_->GetDisplayController(bounds);
   UpdateWidgetToDrmDeviceMapping();
   UpdateCursorBuffers();
 }
 
-void DriWindowDelegate::SetCursor(const std::vector<SkBitmap>& bitmaps,
-                                  const gfx::Point& location,
-                                  int frame_delay_ms) {
+void DrmWindow::SetCursor(const std::vector<SkBitmap>& bitmaps,
+                          const gfx::Point& location,
+                          int frame_delay_ms) {
   cursor_bitmaps_ = bitmaps;
   cursor_location_ = location;
   cursor_frame_ = 0;
@@ -99,14 +99,13 @@ void DriWindowDelegate::SetCursor(const std::vector<SkBitmap>& bitmaps,
   if (cursor_frame_delay_ms_)
     cursor_timer_.Start(
         FROM_HERE, base::TimeDelta::FromMilliseconds(cursor_frame_delay_ms_),
-        this, &DriWindowDelegate::OnCursorAnimationTimeout);
+        this, &DrmWindow::OnCursorAnimationTimeout);
 
   ResetCursor(false);
 }
 
-void DriWindowDelegate::SetCursorWithoutAnimations(
-    const std::vector<SkBitmap>& bitmaps,
-    const gfx::Point& location) {
+void DrmWindow::SetCursorWithoutAnimations(const std::vector<SkBitmap>& bitmaps,
+                                           const gfx::Point& location) {
   cursor_bitmaps_ = bitmaps;
   cursor_location_ = location;
   cursor_frame_ = 0;
@@ -114,15 +113,14 @@ void DriWindowDelegate::SetCursorWithoutAnimations(
   ResetCursor(false);
 }
 
-void DriWindowDelegate::MoveCursor(const gfx::Point& location) {
+void DrmWindow::MoveCursor(const gfx::Point& location) {
   cursor_location_ = location;
 
   if (controller_)
     controller_->MoveCursor(location);
 }
 
-void DriWindowDelegate::OnDisplayChanged(
-    HardwareDisplayController* controller) {
+void DrmWindow::OnDisplayChanged(HardwareDisplayController* controller) {
   DCHECK(controller);
 
   // If we have a new controller we need to re-allocate the buffers.
@@ -146,13 +144,12 @@ void DriWindowDelegate::OnDisplayChanged(
     UpdateCursorBuffers();
 }
 
-void DriWindowDelegate::OnDisplayRemoved(
-    HardwareDisplayController* controller) {
+void DrmWindow::OnDisplayRemoved(HardwareDisplayController* controller) {
   if (controller_ == controller)
     controller_ = nullptr;
 }
 
-void DriWindowDelegate::ResetCursor(bool bitmap_only) {
+void DrmWindow::ResetCursor(bool bitmap_only) {
   if (!controller_)
     return;
 
@@ -172,14 +169,14 @@ void DriWindowDelegate::ResetCursor(bool bitmap_only) {
   }
 }
 
-void DriWindowDelegate::OnCursorAnimationTimeout() {
+void DrmWindow::OnCursorAnimationTimeout() {
   cursor_frame_++;
   cursor_frame_ %= cursor_bitmaps_.size();
 
   ResetCursor(true);
 }
 
-void DriWindowDelegate::UpdateWidgetToDrmDeviceMapping() {
+void DrmWindow::UpdateWidgetToDrmDeviceMapping() {
   scoped_refptr<DrmDevice> drm = nullptr;
   if (controller_)
     drm = controller_->GetAllocationDrmDevice();
@@ -187,7 +184,7 @@ void DriWindowDelegate::UpdateWidgetToDrmDeviceMapping() {
   device_manager_->UpdateDrmDevice(widget_, drm);
 }
 
-void DriWindowDelegate::UpdateCursorBuffers() {
+void DrmWindow::UpdateCursorBuffers() {
   if (!controller_) {
     for (size_t i = 0; i < arraysize(cursor_buffers_); ++i) {
       cursor_buffers_[i] = nullptr;
@@ -202,7 +199,7 @@ void DriWindowDelegate::UpdateCursorBuffers() {
 
     SkImageInfo info = SkImageInfo::MakeN32Premul(cursor_width, cursor_height);
     for (size_t i = 0; i < arraysize(cursor_buffers_); ++i) {
-      cursor_buffers_[i] = new DriBuffer(drm);
+      cursor_buffers_[i] = new DrmBuffer(drm);
       // Don't register a framebuffer for cursors since they are special (they
       // aren't modesetting buffers and drivers may fail to register them due to
       // their small sizes).
diff --git a/ui/ozone/platform/dri/dri_window_delegate.h b/ui/ozone/platform/drm/gpu/drm_window.h
index 9868068..aa01ae9 100644
--- a/ui/ozone/platform/dri/dri_window_delegate.h
+++ b/ui/ozone/platform/drm/gpu/drm_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
 
 #include <vector>
 
@@ -12,7 +12,7 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/display_change_observer.h"
+#include "ui/ozone/platform/drm/gpu/display_change_observer.h"
 
 class SkBitmap;
 
@@ -23,24 +23,24 @@ class Rect;
 
 namespace ui {
 
-class DriBuffer;
+class DrmBuffer;
 class DrmDeviceManager;
 class HardwareDisplayController;
 class ScreenManager;
 
-// A delegate of the platform window (DriWindow) on the GPU process. This is
+// A delegate of the platform window (DrmWindow) on the GPU process. This is
 // used to keep track of window state changes such that each platform window is
 // correctly associated with a display.
 // A window is associated with the display whose bounds contains the window
 // bounds. If there's no suitable display, the window is disconnected and its
 // contents will not be visible.
-class OZONE_EXPORT DriWindowDelegate : public DisplayChangeObserver {
+class OZONE_EXPORT DrmWindow : public DisplayChangeObserver {
  public:
-  DriWindowDelegate(gfx::AcceleratedWidget widget,
-                    DrmDeviceManager* device_manager,
-                    ScreenManager* screen_manager);
+  DrmWindow(gfx::AcceleratedWidget widget,
+            DrmDeviceManager* device_manager,
+            ScreenManager* screen_manager);
 
-  ~DriWindowDelegate() override;
+  ~DrmWindow() override;
 
   void Initialize();
 
@@ -99,9 +99,9 @@ class OZONE_EXPORT DriWindowDelegate : public DisplayChangeObserver {
   // the window isn't over an active display.
   HardwareDisplayController* controller_;
 
-  base::RepeatingTimer<DriWindowDelegate> cursor_timer_;
+  base::RepeatingTimer<DrmWindow> cursor_timer_;
 
-  scoped_refptr<DriBuffer> cursor_buffers_[2];
+  scoped_refptr<DrmBuffer> cursor_buffers_[2];
   int cursor_frontbuffer_;
 
   std::vector<SkBitmap> cursor_bitmaps_;
@@ -109,9 +109,9 @@ class OZONE_EXPORT DriWindowDelegate : public DisplayChangeObserver {
   int cursor_frame_;
   int cursor_frame_delay_ms_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriWindowDelegate);
+  DISALLOW_COPY_AND_ASSIGN(DrmWindow);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_H_
diff --git a/ui/ozone/platform/dri/dri_window_delegate_manager.cc b/ui/ozone/platform/drm/gpu/drm_window_manager.cc
index 814d301..1616086 100644
--- a/ui/ozone/platform/dri/dri_window_delegate_manager.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window_manager.cc
@@ -2,37 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
 
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
 
 namespace ui {
 
-DriWindowDelegateManager::DriWindowDelegateManager() {
+DrmWindowManager::DrmWindowManager() {
 }
 
-DriWindowDelegateManager::~DriWindowDelegateManager() {
+DrmWindowManager::~DrmWindowManager() {
   DCHECK(delegate_map_.empty());
 }
 
-void DriWindowDelegateManager::AddWindowDelegate(
-    gfx::AcceleratedWidget widget,
-    scoped_ptr<DriWindowDelegate> delegate) {
+void DrmWindowManager::AddWindowDelegate(gfx::AcceleratedWidget widget,
+                                         scoped_ptr<DrmWindow> delegate) {
   std::pair<WidgetToDelegateMap::iterator, bool> result =
       delegate_map_.add(widget, delegate.Pass());
   DCHECK(result.second) << "Delegate already added.";
 }
 
-scoped_ptr<DriWindowDelegate> DriWindowDelegateManager::RemoveWindowDelegate(
+scoped_ptr<DrmWindow> DrmWindowManager::RemoveWindowDelegate(
     gfx::AcceleratedWidget widget) {
-  scoped_ptr<DriWindowDelegate> delegate = delegate_map_.take_and_erase(widget);
+  scoped_ptr<DrmWindow> delegate = delegate_map_.take_and_erase(widget);
   DCHECK(delegate) << "Attempting to remove non-existing delegate for "
                    << widget;
   return delegate.Pass();
 }
 
-DriWindowDelegate* DriWindowDelegateManager::GetWindowDelegate(
-    gfx::AcceleratedWidget widget) {
+DrmWindow* DrmWindowManager::GetWindowDelegate(gfx::AcceleratedWidget widget) {
   WidgetToDelegateMap::iterator it = delegate_map_.find(widget);
   if (it != delegate_map_.end())
     return it->second;
diff --git a/ui/ozone/platform/dri/dri_window_delegate_manager.h b/ui/ozone/platform/drm/gpu/drm_window_manager.h
index 5a4ed27..5b77aad 100644
--- a/ui/ozone/platform/dri/dri_window_delegate_manager.h
+++ b/ui/ozone/platform/drm/gpu/drm_window_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_MANAGER_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "ui/gfx/native_widget_types.h"
@@ -11,36 +11,35 @@
 
 namespace ui {
 
-class DriWindowDelegate;
+class DrmWindow;
 
-class OZONE_EXPORT DriWindowDelegateManager {
+class OZONE_EXPORT DrmWindowManager {
  public:
-  DriWindowDelegateManager();
-  ~DriWindowDelegateManager();
+  DrmWindowManager();
+  ~DrmWindowManager();
 
   // Adds a delegate for |widget|. Note: |widget| should not be associated with
   // a delegate when calling this function.
   void AddWindowDelegate(gfx::AcceleratedWidget widget,
-                         scoped_ptr<DriWindowDelegate> surface);
+                         scoped_ptr<DrmWindow> surface);
 
   // Removes the delegate for |widget|. Note: |widget| must have a delegate
   // associated with it when calling this function.
-  scoped_ptr<DriWindowDelegate> RemoveWindowDelegate(
-      gfx::AcceleratedWidget widget);
+  scoped_ptr<DrmWindow> RemoveWindowDelegate(gfx::AcceleratedWidget widget);
 
   // Returns the delegate associated with |widget|. Note: This function should
   // be called only if a valid delegate has been associated with |widget|.
-  DriWindowDelegate* GetWindowDelegate(gfx::AcceleratedWidget widget);
+  DrmWindow* GetWindowDelegate(gfx::AcceleratedWidget widget);
 
  private:
-  typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget, DriWindowDelegate>
+  typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget, DrmWindow>
       WidgetToDelegateMap;
 
   WidgetToDelegateMap delegate_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriWindowDelegateManager);
+  DISALLOW_COPY_AND_ASSIGN(DrmWindowManager);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_DELEGATE_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_DRM_WINDOW_MANAGER_H_
diff --git a/ui/ozone/platform/dri/dri_window_delegate_unittest.cc b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
index 2df1cbe..bd13731 100644
--- a/ui/ozone/platform/dri/dri_window_delegate_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
@@ -10,15 +10,15 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_surface.h"
-#include "ui/ozone/platform/dri/dri_surface_factory.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/drm_surface_factory.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_surface.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace {
@@ -47,9 +47,9 @@ std::vector<skia::RefPtr<SkSurface>> GetCursorBuffers(
 
 }  // namespace
 
-class DriWindowDelegateTest : public testing::Test {
+class DrmWindowTest : public testing::Test {
  public:
-  DriWindowDelegateTest() {}
+  DrmWindowTest() {}
 
   void SetUp() override;
   void TearDown() override;
@@ -57,28 +57,28 @@ class DriWindowDelegateTest : public testing::Test {
  protected:
   scoped_ptr<base::MessageLoop> message_loop_;
   scoped_refptr<ui::MockDrmDevice> drm_;
-  scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
+  scoped_ptr<ui::DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ui::ScreenManager> screen_manager_;
   scoped_ptr<ui::DrmDeviceManager> drm_device_manager_;
-  scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_;
+  scoped_ptr<ui::DrmWindowManager> window_delegate_manager_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DriWindowDelegateTest);
+  DISALLOW_COPY_AND_ASSIGN(DrmWindowTest);
 };
 
-void DriWindowDelegateTest::SetUp() {
+void DrmWindowTest::SetUp() {
   message_loop_.reset(new base::MessageLoopForUI);
   drm_ = new ui::MockDrmDevice();
-  buffer_generator_.reset(new ui::DriBufferGenerator());
+  buffer_generator_.reset(new ui::DrmBufferGenerator());
   screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
   screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector);
   screen_manager_->ConfigureDisplayController(
       drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
 
   drm_device_manager_.reset(new ui::DrmDeviceManager(drm_));
-  window_delegate_manager_.reset(new ui::DriWindowDelegateManager());
+  window_delegate_manager_.reset(new ui::DrmWindowManager());
 
-  scoped_ptr<ui::DriWindowDelegate> window_delegate(new ui::DriWindowDelegate(
+  scoped_ptr<ui::DrmWindow> window_delegate(new ui::DrmWindow(
       kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get()));
   window_delegate->Initialize();
   window_delegate->OnBoundsChanged(
@@ -87,14 +87,14 @@ void DriWindowDelegateTest::SetUp() {
                                               window_delegate.Pass());
 }
 
-void DriWindowDelegateTest::TearDown() {
-  scoped_ptr<ui::DriWindowDelegate> delegate =
+void DrmWindowTest::TearDown() {
+  scoped_ptr<ui::DrmWindow> delegate =
       window_delegate_manager_->RemoveWindowDelegate(kDefaultWidgetHandle);
   delegate->Shutdown();
   message_loop_.reset();
 }
 
-TEST_F(DriWindowDelegateTest, SetCursorImage) {
+TEST_F(DrmWindowTest, SetCursorImage) {
   SkBitmap image;
   SkImageInfo info =
       SkImageInfo::Make(6, 4, kN32_SkColorType, kPremul_SkAlphaType);
@@ -126,7 +126,7 @@ TEST_F(DriWindowDelegateTest, SetCursorImage) {
   }
 }
 
-TEST_F(DriWindowDelegateTest, CheckCursorSurfaceAfterChangingDevice) {
+TEST_F(DrmWindowTest, CheckCursorSurfaceAfterChangingDevice) {
   // Add another device.
   scoped_refptr<ui::MockDrmDevice> drm = new ui::MockDrmDevice();
   screen_manager_->AddDisplayController(drm, kDefaultCrtc, kDefaultConnector);
diff --git a/ui/ozone/platform/dri/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
index 30f0ad8..795b29d 100644
--- a/ui/ozone/platform/dri/gbm_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
 
 #include <drm.h>
 #include <fcntl.h>
@@ -11,7 +11,7 @@
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
-#include "ui/ozone/platform/dri/gbm_device.h"
+#include "ui/ozone/platform/drm/gpu/gbm_device.h"
 
 namespace ui {
 
@@ -48,7 +48,7 @@ scoped_refptr<GbmBuffer> GbmBuffer::CreateBuffer(
     SurfaceFactoryOzone::BufferFormat format,
     const gfx::Size& size,
     bool scanout) {
-  TRACE_EVENT2("dri", "GbmBuffer::CreateBuffer", "device",
+  TRACE_EVENT2("drm", "GbmBuffer::CreateBuffer", "device",
                gbm->device_path().value(), "size", size.ToString());
   unsigned flags = GBM_BO_USE_RENDERING;
   if (scanout)
diff --git a/ui/ozone/platform/dri/gbm_buffer.h b/ui/ozone/platform/drm/gpu/gbm_buffer.h
index 7e34068..2cd388f 100644
--- a/ui/ozone/platform/dri/gbm_buffer.h
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/ozone/platform/dri/gbm_buffer_base.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer_base.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
@@ -56,4 +56,4 @@ class GbmPixmap : public NativePixmap {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
diff --git a/ui/ozone/platform/dri/gbm_buffer_base.cc b/ui/ozone/platform/drm/gpu/gbm_buffer_base.cc
index ca835e3..9d65108 100644
--- a/ui/ozone/platform/dri/gbm_buffer_base.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer_base.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_buffer_base.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer_base.h"
 
 #include <gbm.h>
 
 #include "base/logging.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/gbm_buffer_base.h b/ui/ozone/platform/drm/gpu/gbm_buffer_base.h
index 9152483..8062b77 100644
--- a/ui/ozone/platform/dri/gbm_buffer_base.h
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer_base.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_BUFFER_BASE_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_BUFFER_BASE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_BASE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_BASE_H_
 
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 struct gbm_bo;
 
@@ -40,4 +40,4 @@ class GbmBufferBase : public ScanoutBuffer {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_BUFFER_BASE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_BASE_H_
diff --git a/ui/ozone/platform/dri/gbm_device.cc b/ui/ozone/platform/drm/gpu/gbm_device.cc
index e726c2f..d0e5620 100644
--- a/ui/ozone/platform/dri/gbm_device.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_device.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_device.h"
+#include "ui/ozone/platform/drm/gpu/gbm_device.h"
 
 #include <gbm.h>
 
diff --git a/ui/ozone/platform/dri/gbm_device.h b/ui/ozone/platform/drm/gpu/gbm_device.h
index 7395bf8..a199572 100644
--- a/ui/ozone/platform/dri/gbm_device.h
+++ b/ui/ozone/platform/drm/gpu/gbm_device.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_DEVICE_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_DEVICE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_DEVICE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_GBM_DEVICE_H_
 
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 struct gbm_device;
 
@@ -31,4 +31,4 @@ class GbmDevice : public DrmDevice {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_DEVICE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_DEVICE_H_
diff --git a/ui/ozone/platform/dri/gbm_surface.cc b/ui/ozone/platform/drm/gpu/gbm_surface.cc
index ab8e5e3..80c84f9 100644
--- a/ui/ozone/platform/dri/gbm_surface.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surface.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_surface.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surface.h"
 
 #include <gbm.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/gbm_buffer_base.h"
-#include "ui/ozone/platform/dri/gbm_device.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer_base.h"
+#include "ui/ozone/platform/drm/gpu/gbm_device.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
@@ -51,7 +51,8 @@ GbmSurfaceBuffer::GbmSurfaceBuffer(const scoped_refptr<DrmDevice>& drm,
   }
 }
 
-GbmSurfaceBuffer::~GbmSurfaceBuffer() {}
+GbmSurfaceBuffer::~GbmSurfaceBuffer() {
+}
 
 // static
 scoped_refptr<GbmSurfaceBuffer> GbmSurfaceBuffer::CreateBuffer(
@@ -79,7 +80,7 @@ void GbmSurfaceBuffer::Destroy(gbm_bo* buffer, void* data) {
 
 }  // namespace
 
-GbmSurface::GbmSurface(DriWindowDelegate* window_delegate,
+GbmSurface::GbmSurface(DrmWindow* window_delegate,
                        const scoped_refptr<GbmDevice>& gbm)
     : GbmSurfaceless(window_delegate, NULL),
       gbm_(gbm),
diff --git a/ui/ozone/platform/dri/gbm_surface.h b/ui/ozone/platform/drm/gpu/gbm_surface.h
index c549d9a..65ec8c7 100644
--- a/ui/ozone/platform/dri/gbm_surface.h
+++ b/ui/ozone/platform/drm/gpu/gbm_surface.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACE_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/ozone/platform/dri/gbm_surfaceless.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 struct gbm_bo;
@@ -16,8 +16,8 @@ struct gbm_surface;
 
 namespace ui {
 
-class DriBuffer;
-class DriWindowDelegate;
+class DrmBuffer;
+class DrmWindow;
 class GbmDevice;
 
 // Extends the GBM surfaceless functionality and adds an implicit surface for
@@ -26,8 +26,7 @@ class GbmDevice;
 // surface and is updated via an EGLSurface.
 class GbmSurface : public GbmSurfaceless {
  public:
-  GbmSurface(DriWindowDelegate* window_delegate,
-             const scoped_refptr<GbmDevice>& gbm);
+  GbmSurface(DrmWindow* window_delegate, const scoped_refptr<GbmDevice>& gbm);
   ~GbmSurface() override;
 
   bool Initialize();
@@ -59,4 +58,4 @@ class GbmSurface : public GbmSurfaceless {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACE_H_
diff --git a/ui/ozone/platform/dri/gbm_surfaceless.cc b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
index 30e18e7..138d207 100644
--- a/ui/ozone/platform/dri/gbm_surfaceless.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
@@ -2,26 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/gbm_surfaceless.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "ui/ozone/platform/dri/dri_vsync_provider.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/gbm_buffer.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 namespace ui {
 
-GbmSurfaceless::GbmSurfaceless(DriWindowDelegate* window_delegate,
+GbmSurfaceless::GbmSurfaceless(DrmWindow* window_delegate,
                                DrmDeviceManager* drm_device_manager)
     : window_delegate_(window_delegate),
       drm_device_manager_(drm_device_manager) {
 }
 
-GbmSurfaceless::~GbmSurfaceless() {}
+GbmSurfaceless::~GbmSurfaceless() {
+}
 
 intptr_t GbmSurfaceless::GetNativeWindow() {
   NOTREACHED();
@@ -53,7 +54,7 @@ bool GbmSurfaceless::OnSwapBuffersAsync(
 }
 
 scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() {
-  return make_scoped_ptr(new DriVSyncProvider(window_delegate_));
+  return make_scoped_ptr(new DrmVSyncProvider(window_delegate_));
 }
 
 bool GbmSurfaceless::IsUniversalDisplayLinkDevice() {
diff --git a/ui/ozone/platform/dri/gbm_surfaceless.h b/ui/ozone/platform/drm/gpu/gbm_surfaceless.h
index 2247191..c890d9d 100644
--- a/ui/ozone/platform/dri/gbm_surfaceless.h
+++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_GBM_SURFACELESS_H_
-#define UI_OZONE_PLATFORM_DRI_GBM_SURFACELESS_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACELESS_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACELESS_H_
 
 #include "ui/ozone/public/surface_ozone_egl.h"
 
@@ -13,8 +13,8 @@ class Size;
 
 namespace ui {
 
-class DriWindowDelegate;
 class DrmDeviceManager;
+class DrmWindow;
 
 // In surfaceless mode drawing and displaying happens directly through
 // NativePixmap buffers. CC would call into SurfaceFactoryOzone to allocate the
@@ -22,7 +22,7 @@ class DrmDeviceManager;
 // presentation.
 class GbmSurfaceless : public SurfaceOzoneEGL {
  public:
-  GbmSurfaceless(DriWindowDelegate* window_delegate,
+  GbmSurfaceless(DrmWindow* window_delegate,
                  DrmDeviceManager* drm_device_manager);
   ~GbmSurfaceless() override;
 
@@ -35,7 +35,7 @@ class GbmSurfaceless : public SurfaceOzoneEGL {
   bool IsUniversalDisplayLinkDevice() override;
 
  protected:
-  DriWindowDelegate* window_delegate_;
+  DrmWindow* window_delegate_;
   DrmDeviceManager* drm_device_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceless);
@@ -43,4 +43,4 @@ class GbmSurfaceless : public SurfaceOzoneEGL {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_GBM_SURFACELESS_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_SURFACELESS_H_
diff --git a/ui/ozone/platform/dri/hardware_display_controller.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
index 0615067..fd5edb4 100644
--- a/ui/ozone/platform/dri/hardware_display_controller.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 #include <drm.h>
 #include <errno.h>
@@ -15,9 +15,9 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace ui {
@@ -47,7 +47,7 @@ HardwareDisplayController::~HardwareDisplayController() {
 
 bool HardwareDisplayController::Modeset(const OverlayPlane& primary,
                                         drmModeModeInfo mode) {
-  TRACE_EVENT0("dri", "HDC::Modeset");
+  TRACE_EVENT0("drm", "HDC::Modeset");
   DCHECK(primary.buffer.get());
   bool status = true;
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
@@ -70,7 +70,7 @@ bool HardwareDisplayController::Modeset(const OverlayPlane& primary,
 }
 
 bool HardwareDisplayController::Enable() {
-  TRACE_EVENT0("dri", "HDC::Enable");
+  TRACE_EVENT0("drm", "HDC::Enable");
   DCHECK(!current_planes_.empty());
   const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(current_planes_);
 
@@ -78,7 +78,7 @@ bool HardwareDisplayController::Enable() {
 }
 
 void HardwareDisplayController::Disable() {
-  TRACE_EVENT0("dri", "HDC::Disable");
+  TRACE_EVENT0("drm", "HDC::Disable");
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     crtc_controllers_[i]->Disable();
 
@@ -92,7 +92,7 @@ void HardwareDisplayController::QueueOverlayPlane(const OverlayPlane& plane) {
 bool HardwareDisplayController::SchedulePageFlip(
     bool is_sync,
     const base::Closure& callback) {
-  TRACE_EVENT0("dri", "HDC::SchedulePageFlip");
+  TRACE_EVENT0("drm", "HDC::SchedulePageFlip");
 
   // Ignore requests with no planes to schedule.
   if (pending_planes_.empty()) {
@@ -223,7 +223,7 @@ uint64_t HardwareDisplayController::GetTimeOfLastFlip() const {
 }
 
 void HardwareDisplayController::OnPageFlipEvent() {
-  TRACE_EVENT0("dri", "HDC::OnPageFlipEvent");
+  TRACE_EVENT0("drm", "HDC::OnPageFlipEvent");
   // OnPageFlipEvent() needs to handle 2 cases:
   //  1) Normal page flips in which case:
   //    a) HasPendingPageFlips() may return false if we're in mirror mode and
@@ -277,7 +277,7 @@ bool HardwareDisplayController::HasPendingPageFlips() const {
 }
 
 bool HardwareDisplayController::ActualSchedulePageFlip() {
-  TRACE_EVENT0("dri", "HDC::ActualSchedulePageFlip");
+  TRACE_EVENT0("drm", "HDC::ActualSchedulePageFlip");
   DCHECK(!requests_.empty());
 
   if (is_disabled_) {
@@ -288,8 +288,8 @@ bool HardwareDisplayController::ActualSchedulePageFlip() {
   OverlayPlaneList pending_planes = requests_.front().planes;
   std::sort(pending_planes.begin(), pending_planes.end(),
             [](const OverlayPlane& l, const OverlayPlane& r) {
-    return l.z_order < r.z_order;
-  });
+              return l.z_order < r.z_order;
+            });
 
   bool status = true;
   for (size_t i = 0; i < crtc_controllers_.size(); ++i) {
diff --git a/ui/ozone/platform/dri/hardware_display_controller.h b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
index e32ba63..ee1d606 100644
--- a/ui/ozone/platform/dri/hardware_display_controller.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_CONTROLLER_H_
-#define UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_CONTROLLER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -19,9 +19,9 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
-#include "ui/ozone/platform/dri/overlay_plane.h"
-#include "ui/ozone/platform/dri/page_flip_observer.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/overlay_plane.h"
+#include "ui/ozone/platform/drm/gpu/page_flip_observer.h"
 
 namespace gfx {
 class Point;
@@ -96,8 +96,7 @@ class OZONE_EXPORT HardwareDisplayController
 
   // Performs the initial CRTC configuration. If successful, it will display the
   // framebuffer for |primary| with |mode|.
-  bool Modeset(const OverlayPlane& primary,
-               drmModeModeInfo mode);
+  bool Modeset(const OverlayPlane& primary, drmModeModeInfo mode);
 
   // Reconfigures the CRTC with the current surface and mode.
   bool Enable();
@@ -205,4 +204,4 @@ class OZONE_EXPORT HardwareDisplayController
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_CONTROLLER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
diff --git a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
index f63c136..fb03519 100644
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
@@ -5,11 +5,11 @@
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace {
@@ -116,8 +116,8 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
 TEST_F(HardwareDisplayControllerTest, CheckStateIfModesetFails) {
   drm_->set_set_crtc_expectation(false);
 
-  ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(
-      kDefaultModeSize)));
+  ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>(
+      new MockScanoutBuffer(kDefaultModeSize)));
 
   EXPECT_FALSE(controller_->Modeset(plane, kDefaultMode));
 }
@@ -171,9 +171,7 @@ TEST_F(HardwareDisplayControllerTest, CheckOverlayPresent) {
       new MockScanoutBuffer(kDefaultModeSize)));
   ui::OverlayPlane plane2(
       scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kDefaultModeSize)),
-      1,
-      gfx::OVERLAY_TRANSFORM_NONE,
-      gfx::Rect(kDefaultModeSize),
+      1, gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kDefaultModeSize),
       gfx::RectF(kDefaultModeSizeF));
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
diff --git a/ui/ozone/platform/dri/hardware_display_plane.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane.cc
index cb50c6c..b9a3455 100644
--- a/ui/ozone/platform/dri/hardware_display_plane.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/hardware_display_plane.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane.h"
 
 #include <drm.h>
 #include <errno.h>
@@ -10,7 +10,7 @@
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/hardware_display_plane.h b/ui/ozone/platform/drm/gpu/hardware_display_plane.h
index 2fffae4..bebac94 100644
--- a/ui/ozone/platform/dri/hardware_display_plane.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_H_
-#define UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/basictypes.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace gfx {
 class Rect;
@@ -50,4 +50,4 @@ class OZONE_EXPORT HardwareDisplayPlane {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_H_
diff --git a/ui/ozone/platform/dri/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index 0c0b321..2e9a1b5 100644
--- a/ui/ozone/platform/dri/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 
 #include <drm.h>
 #include <errno.h>
@@ -10,10 +10,10 @@
 
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 #include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
@@ -121,8 +121,8 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
 
   std::sort(planes_.begin(), planes_.end(),
             [](HardwareDisplayPlane* l, HardwareDisplayPlane* r) {
-    return l->plane_id() < r->plane_id();
-  });
+              return l->plane_id() < r->plane_id();
+            });
   return true;
 }
 
diff --git a/ui/ozone/platform/dri/hardware_display_plane_manager.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h
index 49593e0..76ba50d 100644
--- a/ui/ozone/platform/dri/hardware_display_plane_manager.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,9 +13,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/hardware_display_plane.h"
-#include "ui/ozone/platform/dri/overlay_plane.h"
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane.h"
+#include "ui/ozone/platform/drm/gpu/overlay_plane.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 namespace gfx {
 class Rect;
@@ -23,8 +23,8 @@ class Rect;
 
 namespace ui {
 
-class DrmDevice;
 class CrtcController;
+class DrmDevice;
 
 // This contains the list of planes controlled by one HDC on a given DRM fd.
 // It is owned by the HDC and filled by the CrtcController.
@@ -122,4 +122,4 @@ class OZONE_EXPORT HardwareDisplayPlaneManager {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_H_
diff --git a/ui/ozone/platform/dri/hardware_display_plane_manager_legacy.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc
index b41f456..a82ebc5 100644
--- a/ui/ozone/platform/dri/hardware_display_plane_manager_legacy.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
 
 #include "base/bind.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h
index cc3bfd0..8bf80cd 100644
--- a/ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
-#define UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
 
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 
 namespace ui {
 
@@ -32,4 +32,4 @@ class OZONE_EXPORT HardwareDisplayPlaneManagerLegacy
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_PLANE_MANAGER_ATOMIC_H_
diff --git a/ui/ozone/platform/dri/hardware_display_plane_manager_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
index 5ee0254..862b99e 100644
--- a/ui/ozone/platform/dri/hardware_display_plane_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
@@ -6,14 +6,14 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/hardware_display_plane.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
-#include "ui/ozone/platform/dri/overlay_plane.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
+#include "ui/ozone/platform/drm/gpu/overlay_plane.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 
 namespace {
 
@@ -57,8 +57,8 @@ class FakePlaneManager : public ui::HardwareDisplayPlaneManager {
     // The real HDPM uses sorted planes, so sort them for consistency.
     std::sort(planes_.begin(), planes_.end(),
               [](ui::HardwareDisplayPlane* l, ui::HardwareDisplayPlane* r) {
-      return l->plane_id() < r->plane_id();
-    });
+                return l->plane_id() < r->plane_id();
+              });
   }
 
   bool Commit(ui::HardwareDisplayPlaneList* plane_list, bool is_sync) override {
diff --git a/ui/ozone/platform/dri/overlay_plane.cc b/ui/ozone/platform/drm/gpu/overlay_plane.cc
index 674586d..c4c0d58 100644
--- a/ui/ozone/platform/dri/overlay_plane.cc
+++ b/ui/ozone/platform/drm/gpu/overlay_plane.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/overlay_plane.h"
+#include "ui/ozone/platform/drm/gpu/overlay_plane.h"
 
 #include "base/logging.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/overlay_plane.h b/ui/ozone/platform/drm/gpu/overlay_plane.h
index 9b566ac..38c7cbd 100644
--- a/ui/ozone/platform/dri/overlay_plane.h
+++ b/ui/ozone/platform/drm/gpu/overlay_plane.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_OVERLAY_PLANE_H_
-#define UI_OZONE_PLATFORM_DRI_OVERLAY_PLANE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_OVERLAY_PLANE_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_OVERLAY_PLANE_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ struct OZONE_EXPORT OverlayPlane {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_OVERLAY_PLANE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_OVERLAY_PLANE_H_
diff --git a/ui/ozone/platform/dri/page_flip_observer.h b/ui/ozone/platform/drm/gpu/page_flip_observer.h
index c12b54d..f8c066a 100644
--- a/ui/ozone/platform/dri/page_flip_observer.h
+++ b/ui/ozone/platform/drm/gpu/page_flip_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_PAGE_FLIP_OBSERVER_H_
-#define UI_OZONE_PLATFORM_DRI_PAGE_FLIP_OBSERVER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_PAGE_FLIP_OBSERVER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_PAGE_FLIP_OBSERVER_H_
 
 namespace ui {
 
@@ -16,4 +16,4 @@ class PageFlipObserver {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_PAGE_FLIP_OBSERVER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_PAGE_FLIP_OBSERVER_H_
diff --git a/ui/ozone/platform/dri/scanout_buffer.h b/ui/ozone/platform/drm/gpu/scanout_buffer.h
index bfe1990..ca512aa 100644
--- a/ui/ozone/platform/dri/scanout_buffer.h
+++ b/ui/ozone/platform/drm/gpu/scanout_buffer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_SCANOUT_BUFFER_H_
-#define UI_OZONE_PLATFORM_DRI_SCANOUT_BUFFER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ class ScanoutBufferGenerator {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_SCANOUT_BUFFER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_SCANOUT_BUFFER_H_
diff --git a/ui/ozone/platform/dri/scoped_drm_types.cc b/ui/ozone/platform/drm/gpu/scoped_drm_types.cc
index 0f1c6b3..1519729 100644
--- a/ui/ozone/platform/dri/scoped_drm_types.cc
+++ b/ui/ozone/platform/drm/gpu/scoped_drm_types.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/scoped_drm_types.h"
+#include "ui/ozone/platform/drm/gpu/scoped_drm_types.h"
 
 #include <xf86drmMode.h>
 
diff --git a/ui/ozone/platform/dri/scoped_drm_types.h b/ui/ozone/platform/drm/gpu/scoped_drm_types.h
index bd8b4bc..31c5816 100644
--- a/ui/ozone/platform/dri/scoped_drm_types.h
+++ b/ui/ozone/platform/drm/gpu/scoped_drm_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_SCOPED_DRM_TYPES_H_
-#define UI_OZONE_PLATFORM_DRI_SCOPED_DRM_TYPES_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/ozone/ozone_export.h"
@@ -62,9 +62,9 @@ typedef scoped_ptr<drmModePlane, DrmPlaneDeleter> ScopedDrmPlanePtr;
 typedef scoped_ptr<drmModePlaneRes, DrmPlaneResDeleter> ScopedDrmPlaneResPtr;
 typedef scoped_ptr<drmModePropertyRes, DrmPropertyDeleter> ScopedDrmPropertyPtr;
 typedef scoped_ptr<drmModePropertyBlobRes, DrmPropertyBlobDeleter>
-ScopedDrmPropertyBlobPtr;
+    ScopedDrmPropertyBlobPtr;
 typedef scoped_ptr<drmModeFB, DrmFramebufferDeleter> ScopedDrmFramebufferPtr;
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_SCOPED_DRM_TYPES_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_SCOPED_DRM_TYPES_H_
diff --git a/ui/ozone/platform/dri/screen_manager.cc b/ui/ozone/platform/drm/gpu/screen_manager.cc
index a2b0ee8..3b3dd57 100644
--- a/ui/ozone/platform/dri/screen_manager.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
 
 #include <xf86drmMode.h>
 
@@ -10,12 +10,12 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/dri_console_buffer.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_console_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
@@ -26,7 +26,7 @@ namespace {
 void FillModesetBuffer(const scoped_refptr<DrmDevice>& drm,
                        HardwareDisplayController* controller,
                        ScanoutBuffer* buffer) {
-  DriConsoleBuffer modeset_buffer(drm, buffer->GetFramebufferId());
+  DrmConsoleBuffer modeset_buffer(drm, buffer->GetFramebufferId());
   if (!modeset_buffer.Initialize()) {
     LOG(ERROR) << "Failed to grab framebuffer " << buffer->GetFramebufferId();
     return;
@@ -40,7 +40,7 @@ void FillModesetBuffer(const scoped_refptr<DrmDevice>& drm,
 
   // If the display controller is in mirror mode, the CRTCs should be sharing
   // the same framebuffer.
-  DriConsoleBuffer saved_buffer(drm, crtcs[0]->saved_crtc()->buffer_id);
+  DrmConsoleBuffer saved_buffer(drm, crtcs[0]->saved_crtc()->buffer_id);
   if (!saved_buffer.Initialize()) {
     LOG(ERROR) << "Failed to grab saved framebuffer "
                << crtcs[0]->saved_crtc()->buffer_id;
@@ -195,8 +195,7 @@ ScreenManager::HardwareDisplayControllers::iterator
 ScreenManager::FindDisplayController(const scoped_refptr<DrmDevice>& drm,
                                      uint32_t crtc) {
   for (HardwareDisplayControllers::iterator it = controllers_.begin();
-       it != controllers_.end();
-       ++it) {
+       it != controllers_.end(); ++it) {
     if ((*it)->HasCrtc(drm, crtc))
       return it;
   }
@@ -207,8 +206,7 @@ ScreenManager::FindDisplayController(const scoped_refptr<DrmDevice>& drm,
 ScreenManager::HardwareDisplayControllers::iterator
 ScreenManager::FindActiveDisplayControllerByLocation(const gfx::Rect& bounds) {
   for (HardwareDisplayControllers::iterator it = controllers_.begin();
-       it != controllers_.end();
-       ++it) {
+       it != controllers_.end(); ++it) {
     gfx::Rect controller_bounds((*it)->origin(), (*it)->GetModeSize());
     if (controller_bounds == bounds && !(*it)->IsDisabled())
       return it;
diff --git a/ui/ozone/platform/dri/screen_manager.h b/ui/ozone/platform/drm/gpu/screen_manager.h
index bf8fed9..962abb7 100644
--- a/ui/ozone/platform/dri/screen_manager.h
+++ b/ui/ozone/platform/drm/gpu/screen_manager.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_SCREEN_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_SCREEN_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "ui/ozone/ozone_export.h"
-#include "ui/ozone/platform/dri/display_change_observer.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/display_change_observer.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
 
 typedef struct _drmModeModeInfo drmModeModeInfo;
 
@@ -102,4 +102,4 @@ class OZONE_EXPORT ScreenManager {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_SCREEN_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
diff --git a/ui/ozone/platform/dri/screen_manager_unittest.cc b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
index 58e08d1..2b47cf9 100644
--- a/ui/ozone/platform/dri/screen_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/ozone/platform/dri/crtc_controller.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/gpu/crtc_controller.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 
 namespace {
 
@@ -59,13 +59,13 @@ class ScreenManagerTest : public testing::Test {
 
   // Secondary is in extended mode, right-of primary.
   gfx::Rect GetSecondaryBounds() const {
-    return gfx::Rect(
-        kDefaultMode.hdisplay, 0, kDefaultMode.hdisplay, kDefaultMode.vdisplay);
+    return gfx::Rect(kDefaultMode.hdisplay, 0, kDefaultMode.hdisplay,
+                     kDefaultMode.vdisplay);
   }
 
   void SetUp() override {
     drm_ = new ui::MockDrmDevice();
-    buffer_generator_.reset(new ui::DriBufferGenerator());
+    buffer_generator_.reset(new ui::DrmBufferGenerator());
     screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
     screen_manager_->AddObserver(&observer_);
   }
@@ -77,7 +77,7 @@ class ScreenManagerTest : public testing::Test {
 
  protected:
   scoped_refptr<ui::MockDrmDevice> drm_;
-  scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
+  scoped_ptr<ui::DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ui::ScreenManager> screen_manager_;
 
   TestDisplayChangeObserver observer_;
diff --git a/ui/ozone/platform/drm/host/DEPS b/ui/ozone/platform/drm/host/DEPS
new file mode 100644
index 0000000..bfc56ea
--- /dev/null
+++ b/ui/ozone/platform/drm/host/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "-ui/ozone/platform/drm/gpu",
+]
diff --git a/ui/ozone/platform/dri/channel_observer.h b/ui/ozone/platform/drm/host/channel_observer.h
index 356a79e..ffbfa04 100644
--- a/ui/ozone/platform/dri/channel_observer.h
+++ b/ui/ozone/platform/drm/host/channel_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_CHANNEL_OBSERVER_H_
-#define UI_OZONE_PLATFORM_DRI_CHANNEL_OBSERVER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_CHANNEL_OBSERVER_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_CHANNEL_OBSERVER_H_
 
 namespace ui {
 
@@ -18,4 +18,4 @@ class ChannelObserver {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_CHANNEL_OBSERVER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_CHANNEL_OBSERVER_H_
diff --git a/ui/ozone/platform/dri/display_manager.cc b/ui/ozone/platform/drm/host/display_manager.cc
index aadf0c5..ddf8163 100644
--- a/ui/ozone/platform/dri/display_manager.cc
+++ b/ui/ozone/platform/drm/host/display_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/display_manager.h"
+#include "ui/ozone/platform/drm/host/display_manager.h"
 
 #include "base/logging.h"
 #include "ui/display/types/display_snapshot.h"
diff --git a/ui/ozone/platform/dri/display_manager.h b/ui/ozone/platform/drm/host/display_manager.h
index 653b44e..146a855 100644
--- a/ui/ozone/platform/dri/display_manager.h
+++ b/ui/ozone/platform/drm/host/display_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DISPLAY_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_DISPLAY_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DISPLAY_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DISPLAY_MANAGER_H_
 
 #include <stdint.h>
 
@@ -37,4 +37,4 @@ class DisplayManager {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DISPLAY_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_DISPLAY_MANAGER_H_
diff --git a/ui/ozone/platform/dri/dri_cursor.cc b/ui/ozone/platform/drm/host/drm_cursor.cc
index e415cf5..0cb6329 100644
--- a/ui/ozone/platform/dri/dri_cursor.cc
+++ b/ui/ozone/platform/drm/host/drm_cursor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_cursor.h"
+#include "ui/ozone/platform/drm/host/drm_cursor.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
@@ -10,9 +10,9 @@
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
-#include "ui/ozone/platform/dri/dri_window.h"
-#include "ui/ozone/platform/dri/dri_window_manager.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/events/ozone/chromeos/cursor_controller.h"
@@ -20,21 +20,21 @@
 
 namespace ui {
 
-DriCursor::DriCursor(DriWindowManager* window_manager,
-                     DriGpuPlatformSupportHost* gpu_platform_support_host)
+DrmCursor::DrmCursor(DrmWindowHostManager* window_manager,
+                     DrmGpuPlatformSupportHost* gpu_platform_support_host)
     : window_manager_(window_manager),
       gpu_platform_support_host_(gpu_platform_support_host) {
 }
 
-DriCursor::~DriCursor() {
+DrmCursor::~DrmCursor() {
   gpu_platform_support_host_->UnregisterHandler(this);
 }
 
-void DriCursor::Init() {
+void DrmCursor::Init() {
   gpu_platform_support_host_->RegisterHandler(this);
 }
 
-void DriCursor::SetCursor(gfx::AcceleratedWidget window,
+void DrmCursor::SetCursor(gfx::AcceleratedWidget window,
                           PlatformCursor platform_cursor) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK_NE(window, gfx::kNullAcceleratedWidget);
@@ -51,7 +51,7 @@ void DriCursor::SetCursor(gfx::AcceleratedWidget window,
   SendCursorShowLocked();
 }
 
-void DriCursor::OnWindowAdded(gfx::AcceleratedWidget window,
+void DrmCursor::OnWindowAdded(gfx::AcceleratedWidget window,
                               const gfx::Rect& bounds_in_screen,
                               const gfx::Rect& cursor_confined_bounds) {
 #if DCHECK_IS_ON()
@@ -70,13 +70,13 @@ void DriCursor::OnWindowAdded(gfx::AcceleratedWidget window,
   }
 }
 
-void DriCursor::OnWindowRemoved(gfx::AcceleratedWidget window) {
+void DrmCursor::OnWindowRemoved(gfx::AcceleratedWidget window) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   base::AutoLock lock(state_.lock);
 
   if (state_.window == window) {
     // Try to find a new location for the cursor.
-    DriWindow* dest_window = window_manager_->GetPrimaryWindow();
+    DrmWindowHost* dest_window = window_manager_->GetPrimaryWindow();
 
     if (dest_window) {
       state_.window = dest_window->GetAcceleratedWidget();
@@ -93,7 +93,7 @@ void DriCursor::OnWindowRemoved(gfx::AcceleratedWidget window) {
   }
 }
 
-void DriCursor::PrepareForBoundsChange(gfx::AcceleratedWidget window) {
+void DrmCursor::PrepareForBoundsChange(gfx::AcceleratedWidget window) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   base::AutoLock lock(state_.lock);
 
@@ -107,7 +107,7 @@ void DriCursor::PrepareForBoundsChange(gfx::AcceleratedWidget window) {
   // The cursor will be shown and moved in CommitBoundsChange().
 }
 
-void DriCursor::CommitBoundsChange(
+void DrmCursor::CommitBoundsChange(
     gfx::AcceleratedWidget window,
     const gfx::Rect& new_display_bounds_in_screen,
     const gfx::Rect& new_confined_bounds) {
@@ -121,7 +121,7 @@ void DriCursor::CommitBoundsChange(
   }
 }
 
-void DriCursor::ConfineCursorToBounds(gfx::AcceleratedWidget window,
+void DrmCursor::ConfineCursorToBounds(gfx::AcceleratedWidget window,
                                       const gfx::Rect& bounds) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   base::AutoLock lock(state_.lock);
@@ -132,7 +132,7 @@ void DriCursor::ConfineCursorToBounds(gfx::AcceleratedWidget window,
   }
 }
 
-void DriCursor::MoveCursorTo(gfx::AcceleratedWidget window,
+void DrmCursor::MoveCursorTo(gfx::AcceleratedWidget window,
                              const gfx::PointF& location) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   base::AutoLock lock(state_.lock);
@@ -144,9 +144,9 @@ void DriCursor::MoveCursorTo(gfx::AcceleratedWidget window,
     if (old_window != gfx::kNullAcceleratedWidget)
       SendCursorHideLocked();
 
-    DriWindow* dri_window = window_manager_->GetWindow(window);
-    state_.display_bounds_in_screen = dri_window->GetBounds();
-    state_.confined_bounds = dri_window->GetCursorConfinedBounds();
+    DrmWindowHost* drm_window_host = window_manager_->GetWindow(window);
+    state_.display_bounds_in_screen = drm_window_host->GetBounds();
+    state_.confined_bounds = drm_window_host->GetCursorConfinedBounds();
     state_.window = window;
   }
 
@@ -158,7 +158,7 @@ void DriCursor::MoveCursorTo(gfx::AcceleratedWidget window,
     SendCursorMoveLocked();
 }
 
-void DriCursor::MoveCursorTo(const gfx::PointF& screen_location) {
+void DrmCursor::MoveCursorTo(const gfx::PointF& screen_location) {
   base::AutoLock lock(state_.lock);
 
   // TODO(spang): Moving between windows doesn't work here, but
@@ -170,7 +170,7 @@ void DriCursor::MoveCursorTo(const gfx::PointF& screen_location) {
   SendCursorMoveLocked();
 }
 
-void DriCursor::MoveCursor(const gfx::Vector2dF& delta) {
+void DrmCursor::MoveCursor(const gfx::Vector2dF& delta) {
   base::AutoLock lock(state_.lock);
   if (state_.window == gfx::kNullAcceleratedWidget)
     return;
@@ -188,23 +188,23 @@ void DriCursor::MoveCursor(const gfx::Vector2dF& delta) {
   SendCursorMoveLocked();
 }
 
-bool DriCursor::IsCursorVisible() {
+bool DrmCursor::IsCursorVisible() {
   base::AutoLock lock(state_.lock);
   return state_.bitmap;
 }
 
-gfx::PointF DriCursor::GetLocation() {
+gfx::PointF DrmCursor::GetLocation() {
   base::AutoLock lock(state_.lock);
   return state_.location + state_.display_bounds_in_screen.OffsetFromOrigin();
 }
 
-gfx::Rect DriCursor::GetCursorConfinedBounds() {
+gfx::Rect DrmCursor::GetCursorConfinedBounds() {
   base::AutoLock lock(state_.lock);
   return state_.confined_bounds +
          state_.display_bounds_in_screen.OffsetFromOrigin();
 }
 
-void DriCursor::OnChannelEstablished(
+void DrmCursor::OnChannelEstablished(
     int host_id,
     scoped_refptr<base::SingleThreadTaskRunner> send_runner,
     const base::Callback<void(IPC::Message*)>& send_callback) {
@@ -221,7 +221,7 @@ void DriCursor::OnChannelEstablished(
   // initializes, in CommitBoundsChange().
 }
 
-void DriCursor::OnChannelDestroyed(int host_id) {
+void DrmCursor::OnChannelDestroyed(int host_id) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   base::AutoLock lock(state_.lock);
   if (state_.host_id == host_id) {
@@ -231,11 +231,11 @@ void DriCursor::OnChannelDestroyed(int host_id) {
   }
 }
 
-bool DriCursor::OnMessageReceived(const IPC::Message& message) {
+bool DrmCursor::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
-void DriCursor::SetCursorLocationLocked(const gfx::PointF& location) {
+void DrmCursor::SetCursorLocationLocked(const gfx::PointF& location) {
   state_.lock.AssertAcquired();
 
   gfx::PointF clamped_location = location;
@@ -247,16 +247,16 @@ void DriCursor::SetCursorLocationLocked(const gfx::PointF& location) {
   state_.location = clamped_location;
 }
 
-gfx::Point DriCursor::GetBitmapLocationLocked() {
+gfx::Point DrmCursor::GetBitmapLocationLocked() {
   return gfx::ToFlooredPoint(state_.location) -
          state_.bitmap->hotspot().OffsetFromOrigin();
 }
 
-bool DriCursor::IsConnectedLocked() {
+bool DrmCursor::IsConnectedLocked() {
   return !state_.send_callback.is_null();
 }
 
-void DriCursor::SendCursorShowLocked() {
+void DrmCursor::SendCursorShowLocked() {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (!state_.bitmap) {
     SendCursorHideLocked();
@@ -267,20 +267,20 @@ void DriCursor::SendCursorShowLocked() {
                                        state_.bitmap->frame_delay_ms()));
 }
 
-void DriCursor::SendCursorHideLocked() {
+void DrmCursor::SendCursorHideLocked() {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   SendLocked(new OzoneGpuMsg_CursorSet(state_.window, std::vector<SkBitmap>(),
                                        gfx::Point(), 0));
 }
 
-void DriCursor::SendCursorMoveLocked() {
+void DrmCursor::SendCursorMoveLocked() {
   if (!state_.bitmap)
     return;
   SendLocked(
       new OzoneGpuMsg_CursorMove(state_.window, GetBitmapLocationLocked()));
 }
 
-void DriCursor::SendLocked(IPC::Message* message) {
+void DrmCursor::SendLocked(IPC::Message* message) {
   state_.lock.AssertAcquired();
 
   if (IsConnectedLocked() &&
@@ -288,16 +288,17 @@ void DriCursor::SendLocked(IPC::Message* message) {
                                    base::Bind(state_.send_callback, message)))
     return;
 
-  // Drop disconnected updates. DriWindow will call CommitBoundsChange() when
+  // Drop disconnected updates. DrmWindowHost will call CommitBoundsChange()
+  // when
   // we connect to initialize the cursor location.
   delete message;
 }
 
-DriCursor::CursorState::CursorState()
+DrmCursor::CursorState::CursorState()
     : window(gfx::kNullAcceleratedWidget), host_id(-1) {
 }
 
-DriCursor::CursorState::~CursorState() {
+DrmCursor::CursorState::~CursorState() {
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/dri/dri_cursor.h b/ui/ozone/platform/drm/host/drm_cursor.h
index 59747a5..8482d07 100644
--- a/ui/ozone/platform/dri/dri_cursor.h
+++ b/ui/ozone/platform/drm/host/drm_cursor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_CURSOR_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_CURSOR_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_CURSOR_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DRM_CURSOR_H_
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ -26,14 +26,14 @@ namespace ui {
 
 class BitmapCursorOzone;
 class BitmapCursorFactoryOzone;
-class DriGpuPlatformSupportHost;
-class DriWindowManager;
+class DrmGpuPlatformSupportHost;
+class DrmWindowHostManager;
 
-class DriCursor : public CursorDelegateEvdev, public GpuPlatformSupportHost {
+class DrmCursor : public CursorDelegateEvdev, public GpuPlatformSupportHost {
  public:
-  explicit DriCursor(DriWindowManager* window_manager,
-                     DriGpuPlatformSupportHost* sender);
-  ~DriCursor() override;
+  explicit DrmCursor(DrmWindowHostManager* window_manager,
+                     DrmGpuPlatformSupportHost* sender);
+  ~DrmCursor() override;
 
   void Init();
 
@@ -89,8 +89,8 @@ class DriCursor : public CursorDelegateEvdev, public GpuPlatformSupportHost {
   void SendCursorMoveLocked();
   void SendLocked(IPC::Message* message);
 
-  DriWindowManager* window_manager_;   // Not owned.
-  DriGpuPlatformSupportHost* gpu_platform_support_host_;  // Not owned.
+  DrmWindowHostManager* window_manager_;                  // Not owned.
+  DrmGpuPlatformSupportHost* gpu_platform_support_host_;  // Not owned.
 
   // Task runner for main thread.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
@@ -129,4 +129,4 @@ class DriCursor : public CursorDelegateEvdev, public GpuPlatformSupportHost {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_CURSOR_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_DRM_CURSOR_H_
diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support_host.cc b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.cc
index 0d33f2a..3c6f4e8 100644
--- a/ui/ozone/platform/dri/dri_gpu_platform_support_host.cc
+++ b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.cc
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
 
 #include "base/trace_event/trace_event.h"
 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
-#include "ui/ozone/platform/dri/channel_observer.h"
+#include "ui/ozone/platform/drm/host/channel_observer.h"
 
 namespace ui {
 
-DriGpuPlatformSupportHost::DriGpuPlatformSupportHost() : host_id_(-1) {
+DrmGpuPlatformSupportHost::DrmGpuPlatformSupportHost() : host_id_(-1) {
 }
 
-DriGpuPlatformSupportHost::~DriGpuPlatformSupportHost() {
+DrmGpuPlatformSupportHost::~DrmGpuPlatformSupportHost() {
 }
 
-void DriGpuPlatformSupportHost::RegisterHandler(
+void DrmGpuPlatformSupportHost::RegisterHandler(
     GpuPlatformSupportHost* handler) {
   handlers_.push_back(handler);
 
@@ -25,7 +25,7 @@ void DriGpuPlatformSupportHost::RegisterHandler(
     handler->OnChannelEstablished(host_id_, send_runner_, send_callback_);
 }
 
-void DriGpuPlatformSupportHost::UnregisterHandler(
+void DrmGpuPlatformSupportHost::UnregisterHandler(
     GpuPlatformSupportHost* handler) {
   std::vector<GpuPlatformSupportHost*>::iterator it =
       std::find(handlers_.begin(), handlers_.end(), handler);
@@ -33,27 +33,27 @@ void DriGpuPlatformSupportHost::UnregisterHandler(
     handlers_.erase(it);
 }
 
-void DriGpuPlatformSupportHost::AddChannelObserver(ChannelObserver* observer) {
+void DrmGpuPlatformSupportHost::AddChannelObserver(ChannelObserver* observer) {
   channel_observers_.AddObserver(observer);
 
   if (IsConnected())
     observer->OnChannelEstablished();
 }
 
-void DriGpuPlatformSupportHost::RemoveChannelObserver(
+void DrmGpuPlatformSupportHost::RemoveChannelObserver(
     ChannelObserver* observer) {
   channel_observers_.RemoveObserver(observer);
 }
 
-bool DriGpuPlatformSupportHost::IsConnected() {
+bool DrmGpuPlatformSupportHost::IsConnected() {
   return host_id_ >= 0;
 }
 
-void DriGpuPlatformSupportHost::OnChannelEstablished(
+void DrmGpuPlatformSupportHost::OnChannelEstablished(
     int host_id,
     scoped_refptr<base::SingleThreadTaskRunner> send_runner,
     const base::Callback<void(IPC::Message*)>& send_callback) {
-  TRACE_EVENT1("dri", "DriGpuPlatformSupportHost::OnChannelEstablished",
+  TRACE_EVENT1("drm", "DrmGpuPlatformSupportHost::OnChannelEstablished",
                "host_id", host_id);
   host_id_ = host_id;
   send_runner_ = send_runner;
@@ -66,8 +66,8 @@ void DriGpuPlatformSupportHost::OnChannelEstablished(
                     OnChannelEstablished());
 }
 
-void DriGpuPlatformSupportHost::OnChannelDestroyed(int host_id) {
-  TRACE_EVENT1("dri", "DriGpuPlatformSupportHost::OnChannelDestroyed",
+void DrmGpuPlatformSupportHost::OnChannelDestroyed(int host_id) {
+  TRACE_EVENT1("drm", "DrmGpuPlatformSupportHost::OnChannelDestroyed",
                "host_id", host_id);
   if (host_id_ == host_id) {
     host_id_ = -1;
@@ -81,7 +81,7 @@ void DriGpuPlatformSupportHost::OnChannelDestroyed(int host_id) {
     handlers_[i]->OnChannelDestroyed(host_id);
 }
 
-bool DriGpuPlatformSupportHost::OnMessageReceived(const IPC::Message& message) {
+bool DrmGpuPlatformSupportHost::OnMessageReceived(const IPC::Message& message) {
   for (size_t i = 0; i < handlers_.size(); ++i)
     if (handlers_[i]->OnMessageReceived(message))
       return true;
@@ -89,7 +89,7 @@ bool DriGpuPlatformSupportHost::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
-bool DriGpuPlatformSupportHost::Send(IPC::Message* message) {
+bool DrmGpuPlatformSupportHost::Send(IPC::Message* message) {
   if (IsConnected() &&
       send_runner_->PostTask(FROM_HERE, base::Bind(send_callback_, message)))
     return true;
diff --git a/ui/ozone/platform/dri/dri_gpu_platform_support_host.h b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h
index 444ea70..bad5b38 100644
--- a/ui/ozone/platform/dri/dri_gpu_platform_support_host.h
+++ b/ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_HOST_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_GPU_PLATFORM_SUPPORT_HOST_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_GPU_PLATFORM_SUPPORT_HOST_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DRM_GPU_PLATFORM_SUPPORT_HOST_H_
 
 #include <vector>
 
@@ -22,11 +22,11 @@ namespace ui {
 
 class ChannelObserver;
 
-class DriGpuPlatformSupportHost : public GpuPlatformSupportHost,
+class DrmGpuPlatformSupportHost : public GpuPlatformSupportHost,
                                   public IPC::Sender {
  public:
-  DriGpuPlatformSupportHost();
-  ~DriGpuPlatformSupportHost() override;
+  DrmGpuPlatformSupportHost();
+  ~DrmGpuPlatformSupportHost() override;
 
   void RegisterHandler(GpuPlatformSupportHost* handler);
   void UnregisterHandler(GpuPlatformSupportHost* handler);
@@ -61,4 +61,4 @@ class DriGpuPlatformSupportHost : public GpuPlatformSupportHost,
 
 }  // namespace ui
 
-#endif  // UI_OZONE_GPU_DRI_GPU_PLATFORM_SUPPORT_HOST_H_
+#endif  // UI_OZONE_GPU_DRM_GPU_PLATFORM_SUPPORT_HOST_H_
diff --git a/ui/ozone/platform/dri/native_display_delegate_proxy.cc b/ui/ozone/platform/drm/host/drm_native_display_delegate.cc
index f9d0fa3..89de06d 100644
--- a/ui/ozone/platform/dri/native_display_delegate_proxy.cc
+++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/native_display_delegate_proxy.h"
+#include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
 
 #include <stdio.h>
 
@@ -17,8 +17,8 @@
 #include "ui/ozone/common/display_snapshot_proxy.h"
 #include "ui/ozone/common/display_util.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
-#include "ui/ozone/platform/dri/display_manager.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/display_manager.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
 
 namespace ui {
 
@@ -46,28 +46,28 @@ void OpenDeviceOnWorkerThread(
   }
 }
 
-class DriDisplaySnapshotProxy : public DisplaySnapshotProxy {
+class DrmDisplaySnapshotProxy : public DisplaySnapshotProxy {
  public:
-  DriDisplaySnapshotProxy(const DisplaySnapshot_Params& params,
+  DrmDisplaySnapshotProxy(const DisplaySnapshot_Params& params,
                           DisplayManager* display_manager)
       : DisplaySnapshotProxy(params), display_manager_(display_manager) {
     display_manager_->RegisterDisplay(this);
   }
 
-  ~DriDisplaySnapshotProxy() override {
+  ~DrmDisplaySnapshotProxy() override {
     display_manager_->UnregisterDisplay(this);
   }
 
  private:
   DisplayManager* display_manager_;  // Not owned.
 
-  DISALLOW_COPY_AND_ASSIGN(DriDisplaySnapshotProxy);
+  DISALLOW_COPY_AND_ASSIGN(DrmDisplaySnapshotProxy);
 };
 
 }  // namespace
 
-NativeDisplayDelegateProxy::NativeDisplayDelegateProxy(
-    DriGpuPlatformSupportHost* proxy,
+DrmNativeDisplayDelegate::DrmNativeDisplayDelegate(
+    DrmGpuPlatformSupportHost* proxy,
     DeviceManager* device_manager,
     DisplayManager* display_manager,
     const base::FilePath& primary_graphics_card_path)
@@ -80,12 +80,12 @@ NativeDisplayDelegateProxy::NativeDisplayDelegateProxy(
   proxy_->RegisterHandler(this);
 }
 
-NativeDisplayDelegateProxy::~NativeDisplayDelegateProxy() {
+DrmNativeDisplayDelegate::~DrmNativeDisplayDelegate() {
   device_manager_->RemoveObserver(this);
   proxy_->UnregisterHandler(this);
 }
 
-void NativeDisplayDelegateProxy::Initialize() {
+void DrmNativeDisplayDelegate::Initialize() {
   device_manager_->AddObserver(this);
   device_manager_->ScanDevices(this);
 
@@ -108,40 +108,40 @@ void NativeDisplayDelegateProxy::Initialize() {
   if (success || CreateSnapshotFromCommandLine(&params)) {
     LOG_IF(ERROR, !success) << "Failed to read display_info.bin.";
     DCHECK_NE(DISPLAY_CONNECTION_TYPE_NONE, params.type);
-    displays_.push_back(new DriDisplaySnapshotProxy(params, display_manager_));
+    displays_.push_back(new DrmDisplaySnapshotProxy(params, display_manager_));
     has_dummy_display_ = true;
   } else {
     LOG(ERROR) << "Failed to obtain initial display info";
   }
 }
 
-void NativeDisplayDelegateProxy::GrabServer() {
+void DrmNativeDisplayDelegate::GrabServer() {
 }
 
-void NativeDisplayDelegateProxy::UngrabServer() {
+void DrmNativeDisplayDelegate::UngrabServer() {
 }
 
-bool NativeDisplayDelegateProxy::TakeDisplayControl() {
+bool DrmNativeDisplayDelegate::TakeDisplayControl() {
   proxy_->Send(new OzoneGpuMsg_TakeDisplayControl());
   return true;
 }
 
-bool NativeDisplayDelegateProxy::RelinquishDisplayControl() {
+bool DrmNativeDisplayDelegate::RelinquishDisplayControl() {
   proxy_->Send(new OzoneGpuMsg_RelinquishDisplayControl());
   return true;
 }
 
-void NativeDisplayDelegateProxy::SyncWithServer() {
+void DrmNativeDisplayDelegate::SyncWithServer() {
 }
 
-void NativeDisplayDelegateProxy::SetBackgroundColor(uint32_t color_argb) {
+void DrmNativeDisplayDelegate::SetBackgroundColor(uint32_t color_argb) {
   NOTIMPLEMENTED();
 }
 
-void NativeDisplayDelegateProxy::ForceDPMSOn() {
+void DrmNativeDisplayDelegate::ForceDPMSOn() {
 }
 
-void NativeDisplayDelegateProxy::GetDisplays(
+void DrmNativeDisplayDelegate::GetDisplays(
     const GetDisplaysCallback& callback) {
   get_displays_callback_ = callback;
   // GetDisplays() is supposed to force a refresh of the display list.
@@ -151,14 +151,14 @@ void NativeDisplayDelegateProxy::GetDisplays(
   }
 }
 
-void NativeDisplayDelegateProxy::AddMode(const DisplaySnapshot& output,
-                                         const DisplayMode* mode) {
+void DrmNativeDisplayDelegate::AddMode(const DisplaySnapshot& output,
+                                       const DisplayMode* mode) {
 }
 
-void NativeDisplayDelegateProxy::Configure(const DisplaySnapshot& output,
-                                           const DisplayMode* mode,
-                                           const gfx::Point& origin,
-                                           const ConfigureCallback& callback) {
+void DrmNativeDisplayDelegate::Configure(const DisplaySnapshot& output,
+                                         const DisplayMode* mode,
+                                         const gfx::Point& origin,
+                                         const ConfigureCallback& callback) {
   if (has_dummy_display_) {
     callback.Run(true);
     return;
@@ -179,45 +179,44 @@ void NativeDisplayDelegateProxy::Configure(const DisplaySnapshot& output,
     OnDisplayConfigured(output.display_id(), false);
 }
 
-void NativeDisplayDelegateProxy::CreateFrameBuffer(const gfx::Size& size) {
+void DrmNativeDisplayDelegate::CreateFrameBuffer(const gfx::Size& size) {
 }
 
-bool NativeDisplayDelegateProxy::GetHDCPState(const DisplaySnapshot& output,
-                                              HDCPState* state) {
+bool DrmNativeDisplayDelegate::GetHDCPState(const DisplaySnapshot& output,
+                                            HDCPState* state) {
   NOTIMPLEMENTED();
   return false;
 }
 
-bool NativeDisplayDelegateProxy::SetHDCPState(const DisplaySnapshot& output,
-                                              HDCPState state) {
+bool DrmNativeDisplayDelegate::SetHDCPState(const DisplaySnapshot& output,
+                                            HDCPState state) {
   NOTIMPLEMENTED();
   return false;
 }
 
 std::vector<ColorCalibrationProfile>
-NativeDisplayDelegateProxy::GetAvailableColorCalibrationProfiles(
+DrmNativeDisplayDelegate::GetAvailableColorCalibrationProfiles(
     const DisplaySnapshot& output) {
   NOTIMPLEMENTED();
   return std::vector<ColorCalibrationProfile>();
 }
 
-bool NativeDisplayDelegateProxy::SetColorCalibrationProfile(
+bool DrmNativeDisplayDelegate::SetColorCalibrationProfile(
     const DisplaySnapshot& output,
     ColorCalibrationProfile new_profile) {
   NOTIMPLEMENTED();
   return false;
 }
 
-void NativeDisplayDelegateProxy::AddObserver(NativeDisplayObserver* observer) {
+void DrmNativeDisplayDelegate::AddObserver(NativeDisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void NativeDisplayDelegateProxy::RemoveObserver(
-    NativeDisplayObserver* observer) {
+void DrmNativeDisplayDelegate::RemoveObserver(NativeDisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void NativeDisplayDelegateProxy::OnDeviceEvent(const DeviceEvent& event) {
+void DrmNativeDisplayDelegate::OnDeviceEvent(const DeviceEvent& event) {
   if (event.device_type() != DeviceEvent::DISPLAY)
     return;
 
@@ -235,11 +234,10 @@ void NativeDisplayDelegateProxy::OnDeviceEvent(const DeviceEvent& event) {
 
       base::WorkerPool::PostTask(
           FROM_HERE,
-          base::Bind(
-              &OpenDeviceOnWorkerThread, event.path(),
-              base::ThreadTaskRunnerHandle::Get(),
-              base::Bind(&NativeDisplayDelegateProxy::OnNewGraphicsDevice,
-                         weak_ptr_factory_.GetWeakPtr())),
+          base::Bind(&OpenDeviceOnWorkerThread, event.path(),
+                     base::ThreadTaskRunnerHandle::Get(),
+                     base::Bind(&DrmNativeDisplayDelegate::OnNewGraphicsDevice,
+                                weak_ptr_factory_.GetWeakPtr())),
           false /* task_is_slow */);
       return;
     case DeviceEvent::CHANGE:
@@ -259,8 +257,8 @@ void NativeDisplayDelegateProxy::OnDeviceEvent(const DeviceEvent& event) {
                     OnConfigurationChanged());
 }
 
-void NativeDisplayDelegateProxy::OnNewGraphicsDevice(const base::FilePath& path,
-                                                     base::File file) {
+void DrmNativeDisplayDelegate::OnNewGraphicsDevice(const base::FilePath& path,
+                                                   base::File file) {
   DCHECK(file.IsValid());
   proxy_->Send(new OzoneGpuMsg_AddGraphicsDevice(
       path, base::FileDescriptor(file.Pass())));
@@ -269,7 +267,7 @@ void NativeDisplayDelegateProxy::OnNewGraphicsDevice(const base::FilePath& path,
                     OnConfigurationChanged());
 }
 
-void NativeDisplayDelegateProxy::OnChannelEstablished(
+void DrmNativeDisplayDelegate::OnChannelEstablished(
     int host_id,
     scoped_refptr<base::SingleThreadTaskRunner> send_runner,
     const base::Callback<void(IPC::Message*)>& send_callback) {
@@ -278,7 +276,7 @@ void NativeDisplayDelegateProxy::OnChannelEstablished(
                     OnConfigurationChanged());
 }
 
-void NativeDisplayDelegateProxy::OnChannelDestroyed(int host_id) {
+void DrmNativeDisplayDelegate::OnChannelDestroyed(int host_id) {
   // If the channel got destroyed in the middle of a configuration then just
   // respond with failure.
   if (!get_displays_callback_.is_null()) {
@@ -293,11 +291,10 @@ void NativeDisplayDelegateProxy::OnChannelDestroyed(int host_id) {
   configure_callback_map_.clear();
 }
 
-bool NativeDisplayDelegateProxy::OnMessageReceived(
-    const IPC::Message& message) {
+bool DrmNativeDisplayDelegate::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
 
-  IPC_BEGIN_MESSAGE_MAP(NativeDisplayDelegateProxy, message)
+  IPC_BEGIN_MESSAGE_MAP(DrmNativeDisplayDelegate, message)
   IPC_MESSAGE_HANDLER(OzoneHostMsg_UpdateNativeDisplays, OnUpdateNativeDisplays)
   IPC_MESSAGE_HANDLER(OzoneHostMsg_DisplayConfigured, OnDisplayConfigured)
   IPC_MESSAGE_UNHANDLED(handled = false)
@@ -306,13 +303,13 @@ bool NativeDisplayDelegateProxy::OnMessageReceived(
   return handled;
 }
 
-void NativeDisplayDelegateProxy::OnUpdateNativeDisplays(
+void DrmNativeDisplayDelegate::OnUpdateNativeDisplays(
     const std::vector<DisplaySnapshot_Params>& displays) {
   has_dummy_display_ = false;
   displays_.clear();
   for (size_t i = 0; i < displays.size(); ++i)
     displays_.push_back(
-        new DriDisplaySnapshotProxy(displays[i], display_manager_));
+        new DrmDisplaySnapshotProxy(displays[i], display_manager_));
 
   if (!get_displays_callback_.is_null()) {
     get_displays_callback_.Run(displays_.get());
@@ -320,8 +317,8 @@ void NativeDisplayDelegateProxy::OnUpdateNativeDisplays(
   }
 }
 
-void NativeDisplayDelegateProxy::OnDisplayConfigured(int64_t display_id,
-                                                     bool status) {
+void DrmNativeDisplayDelegate::OnDisplayConfigured(int64_t display_id,
+                                                   bool status) {
   auto it = configure_callback_map_.find(display_id);
   if (it != configure_callback_map_.end()) {
     it->second.Run(status);
diff --git a/ui/ozone/platform/dri/native_display_delegate_proxy.h b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
index 324c737..9183fc3 100644
--- a/ui/ozone/platform/dri/native_display_delegate_proxy.h
+++ b/ui/ozone/platform/drm/host/drm_native_display_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_PROXY_H_
-#define UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_PROXY_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_NATIVE_DISPLAY_DELEGATE_HOST_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_NATIVE_DISPLAY_DELEGATE_HOST_H_
 
 #include <map>
 
@@ -20,19 +20,19 @@ namespace ui {
 
 class DeviceManager;
 class DisplayManager;
-class DriGpuPlatformSupportHost;
+class DrmGpuPlatformSupportHost;
 
 struct DisplaySnapshot_Params;
 
-class NativeDisplayDelegateProxy : public NativeDisplayDelegate,
-                                   public DeviceEventObserver,
-                                   public GpuPlatformSupportHost {
+class DrmNativeDisplayDelegate : public NativeDisplayDelegate,
+                                 public DeviceEventObserver,
+                                 public GpuPlatformSupportHost {
  public:
-  NativeDisplayDelegateProxy(DriGpuPlatformSupportHost* proxy,
-                             DeviceManager* device_manager,
-                             DisplayManager* display_manager,
-                             const base::FilePath& primary_graphics_card_path);
-  ~NativeDisplayDelegateProxy() override;
+  DrmNativeDisplayDelegate(DrmGpuPlatformSupportHost* proxy,
+                           DeviceManager* device_manager,
+                           DisplayManager* display_manager,
+                           const base::FilePath& primary_graphics_card_path);
+  ~DrmNativeDisplayDelegate() override;
 
   // NativeDisplayDelegate overrides:
   void Initialize() override;
@@ -79,7 +79,7 @@ class NativeDisplayDelegateProxy : public NativeDisplayDelegate,
 
   void OnNewGraphicsDevice(const base::FilePath& path, base::File file);
 
-  DriGpuPlatformSupportHost* proxy_;  // Not owned.
+  DrmGpuPlatformSupportHost* proxy_;  // Not owned.
   DeviceManager* device_manager_;     // Not owned.
   DisplayManager* display_manager_;   // Not owned.
 
@@ -100,11 +100,11 @@ class NativeDisplayDelegateProxy : public NativeDisplayDelegate,
   // Map between display_id and the configuration callback.
   std::map<int64_t, ConfigureCallback> configure_callback_map_;
 
-  base::WeakPtrFactory<NativeDisplayDelegateProxy> weak_ptr_factory_;
+  base::WeakPtrFactory<DrmNativeDisplayDelegate> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateProxy);
+  DISALLOW_COPY_AND_ASSIGN(DrmNativeDisplayDelegate);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_NATIVE_DISPLAY_DELEGATE_PROXY_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_NATIVE_DISPLAY_DELEGATE_HOST_H_
diff --git a/ui/ozone/platform/dri/dri_window.cc b/ui/ozone/platform/drm/host/drm_window_host.cc
index a5cee6b..0798f3e 100644
--- a/ui/ozone/platform/dri/dri_window.cc
+++ b/ui/ozone/platform/drm/host/drm_window_host.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_window.h"
+#include "ui/ozone/platform/drm/host/drm_window_host.h"
 
 #include "base/bind.h"
 #include "ui/events/devices/device_data_manager.h"
@@ -12,21 +12,21 @@
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
 #include "ui/ozone/common/gpu/ozone_gpu_messages.h"
-#include "ui/ozone/platform/dri/display_manager.h"
-#include "ui/ozone/platform/dri/dri_cursor.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
-#include "ui/ozone/platform/dri/dri_window_manager.h"
+#include "ui/ozone/platform/drm/host/display_manager.h"
+#include "ui/ozone/platform/drm/host/drm_cursor.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
-DriWindow::DriWindow(PlatformWindowDelegate* delegate,
-                     const gfx::Rect& bounds,
-                     DriGpuPlatformSupportHost* sender,
-                     EventFactoryEvdev* event_factory,
-                     DriCursor* cursor,
-                     DriWindowManager* window_manager,
-                     DisplayManager* display_manager)
+DrmWindowHost::DrmWindowHost(PlatformWindowDelegate* delegate,
+                             const gfx::Rect& bounds,
+                             DrmGpuPlatformSupportHost* sender,
+                             EventFactoryEvdev* event_factory,
+                             DrmCursor* cursor,
+                             DrmWindowHostManager* window_manager,
+                             DisplayManager* display_manager)
     : delegate_(delegate),
       sender_(sender),
       event_factory_(event_factory),
@@ -38,7 +38,7 @@ DriWindow::DriWindow(PlatformWindowDelegate* delegate,
   window_manager_->AddWindow(widget_, this);
 }
 
-DriWindow::~DriWindow() {
+DrmWindowHost::~DrmWindowHost() {
   PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
   window_manager_->RemoveWindow(widget_);
   cursor_->OnWindowRemoved(widget_);
@@ -47,63 +47,70 @@ DriWindow::~DriWindow() {
   sender_->Send(new OzoneGpuMsg_DestroyWindowDelegate(widget_));
 }
 
-void DriWindow::Initialize() {
+void DrmWindowHost::Initialize() {
   sender_->AddChannelObserver(this);
   PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
   cursor_->OnWindowAdded(widget_, bounds_, GetCursorConfinedBounds());
   delegate_->OnAcceleratedWidgetAvailable(widget_);
 }
 
-gfx::AcceleratedWidget DriWindow::GetAcceleratedWidget() {
+gfx::AcceleratedWidget DrmWindowHost::GetAcceleratedWidget() {
   return widget_;
 }
 
-gfx::Rect DriWindow::GetCursorConfinedBounds() const {
+gfx::Rect DrmWindowHost::GetCursorConfinedBounds() const {
   return cursor_confined_bounds_.IsEmpty() ? gfx::Rect(bounds_.size())
                                            : cursor_confined_bounds_;
 }
 
-void DriWindow::Show() {}
+void DrmWindowHost::Show() {
+}
 
-void DriWindow::Hide() {}
+void DrmWindowHost::Hide() {
+}
 
-void DriWindow::Close() {}
+void DrmWindowHost::Close() {
+}
 
-void DriWindow::SetBounds(const gfx::Rect& bounds) {
+void DrmWindowHost::SetBounds(const gfx::Rect& bounds) {
   bounds_ = bounds;
   delegate_->OnBoundsChanged(bounds);
   SendBoundsChange();
 }
 
-gfx::Rect DriWindow::GetBounds() {
+gfx::Rect DrmWindowHost::GetBounds() {
   return bounds_;
 }
 
-void DriWindow::SetCapture() {
+void DrmWindowHost::SetCapture() {
   window_manager_->GrabEvents(widget_);
 }
 
-void DriWindow::ReleaseCapture() {
+void DrmWindowHost::ReleaseCapture() {
   window_manager_->UngrabEvents(widget_);
 }
 
-void DriWindow::ToggleFullscreen() {}
+void DrmWindowHost::ToggleFullscreen() {
+}
 
-void DriWindow::Maximize() {}
+void DrmWindowHost::Maximize() {
+}
 
-void DriWindow::Minimize() {}
+void DrmWindowHost::Minimize() {
+}
 
-void DriWindow::Restore() {}
+void DrmWindowHost::Restore() {
+}
 
-void DriWindow::SetCursor(PlatformCursor cursor) {
+void DrmWindowHost::SetCursor(PlatformCursor cursor) {
   cursor_->SetCursor(widget_, cursor);
 }
 
-void DriWindow::MoveCursorTo(const gfx::Point& location) {
+void DrmWindowHost::MoveCursorTo(const gfx::Point& location) {
   event_factory_->WarpCursorTo(widget_, location);
 }
 
-void DriWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
+void DrmWindowHost::ConfineCursorToBounds(const gfx::Rect& bounds) {
   if (cursor_confined_bounds_ == bounds)
     return;
 
@@ -111,7 +118,7 @@ void DriWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
   cursor_->ConfineCursorToBounds(widget_, bounds);
 }
 
-bool DriWindow::CanDispatchEvent(const PlatformEvent& ne) {
+bool DrmWindowHost::CanDispatchEvent(const PlatformEvent& ne) {
   DCHECK(ne);
   Event* event = static_cast<Event*>(ne);
 
@@ -122,7 +129,7 @@ bool DriWindow::CanDispatchEvent(const PlatformEvent& ne) {
 
   if (event->IsTouchEvent()) {
     // Dispatch the event if it is from the touchscreen associated with the
-    // DriWindow. We cannot check the event's location because if the
+    // DrmWindowHost. We cannot check the event's location because if the
     // touchscreen has a bezel, touches in the bezel have a location outside of
     // |bounds_|.
     int64_t display_id =
@@ -148,7 +155,7 @@ bool DriWindow::CanDispatchEvent(const PlatformEvent& ne) {
   return true;
 }
 
-uint32_t DriWindow::DispatchEvent(const PlatformEvent& native_event) {
+uint32_t DrmWindowHost::DispatchEvent(const PlatformEvent& native_event) {
   DCHECK(native_event);
 
   Event* event = static_cast<Event*>(native_event);
@@ -166,16 +173,16 @@ uint32_t DriWindow::DispatchEvent(const PlatformEvent& native_event) {
   return POST_DISPATCH_STOP_PROPAGATION;
 }
 
-void DriWindow::OnChannelEstablished() {
+void DrmWindowHost::OnChannelEstablished() {
   sender_->Send(new OzoneGpuMsg_CreateWindowDelegate(widget_));
   SendBoundsChange();
   cursor_->ConfineCursorToBounds(widget_, GetCursorConfinedBounds());
 }
 
-void DriWindow::OnChannelDestroyed() {
+void DrmWindowHost::OnChannelDestroyed() {
 }
 
-void DriWindow::SendBoundsChange() {
+void DrmWindowHost::SendBoundsChange() {
   cursor_->PrepareForBoundsChange(widget_);
   sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_));
   cursor_->CommitBoundsChange(widget_, bounds_, GetCursorConfinedBounds());
diff --git a/ui/ozone/platform/dri/dri_window.h b/ui/ozone/platform/drm/host/drm_window_host.h
index 3c61318..74021f8 100644
--- a/ui/ozone/platform/dri/dri_window.h
+++ b/ui/ozone/platform/drm/host/drm_window_host.h
@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/ozone/platform/dri/channel_observer.h"
+#include "ui/ozone/platform/drm/host/channel_observer.h"
 #include "ui/platform_window/platform_window.h"
 
 namespace ui {
 
 class DisplayManager;
-class DriCursor;
-class DriWindowDelegate;
-class DriWindowManager;
+class DrmCursor;
+class DrmGpuPlatformSupportHost;
+class DrmGpuWindow;
+class DrmWindowHostManager;
 class EventFactoryEvdev;
-class DriGpuPlatformSupportHost;
 
 // Implementation of the platform window. This object and its handle |widget_|
 // uniquely identify a window. Since the DRI/GBM platform is split into 2
@@ -32,18 +32,18 @@ class DriGpuPlatformSupportHost;
 // State propagation needs to happen before the state change is acknowledged to
 // |delegate_| as |delegate_| is responsible for initializing the surface
 // associated with the window (the surface is created on the GPU process).
-class DriWindow : public PlatformWindow,
-                  public PlatformEventDispatcher,
-                  public ChannelObserver {
+class DrmWindowHost : public PlatformWindow,
+                      public PlatformEventDispatcher,
+                      public ChannelObserver {
  public:
-  DriWindow(PlatformWindowDelegate* delegate,
-            const gfx::Rect& bounds,
-            DriGpuPlatformSupportHost* sender,
-            EventFactoryEvdev* event_factory,
-            DriCursor* cursor,
-            DriWindowManager* window_manager,
-            DisplayManager* display_manager);
-  ~DriWindow() override;
+  DrmWindowHost(PlatformWindowDelegate* delegate,
+                const gfx::Rect& bounds,
+                DrmGpuPlatformSupportHost* sender,
+                EventFactoryEvdev* event_factory,
+                DrmCursor* cursor,
+                DrmWindowHostManager* window_manager,
+                DisplayManager* display_manager);
+  ~DrmWindowHost() override;
 
   void Initialize();
 
@@ -78,21 +78,21 @@ class DriWindow : public PlatformWindow,
  private:
   void SendBoundsChange();
 
-  PlatformWindowDelegate* delegate_;   // Not owned.
-  DriGpuPlatformSupportHost* sender_;  // Not owned.
-  EventFactoryEvdev* event_factory_;   // Not owned.
-  DriCursor* cursor_;                  // Not owned.
-  DriWindowManager* window_manager_;   // Not owned.
-  DisplayManager* display_manager_;    // Not owned.
+  PlatformWindowDelegate* delegate_;      // Not owned.
+  DrmGpuPlatformSupportHost* sender_;     // Not owned.
+  EventFactoryEvdev* event_factory_;      // Not owned.
+  DrmCursor* cursor_;                     // Not owned.
+  DrmWindowHostManager* window_manager_;  // Not owned.
+  DisplayManager* display_manager_;       // Not owned.
 
   gfx::Rect bounds_;
   gfx::AcceleratedWidget widget_;
 
   gfx::Rect cursor_confined_bounds_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriWindow);
+  DISALLOW_COPY_AND_ASSIGN(DrmWindowHost);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_H_
diff --git a/ui/ozone/platform/dri/dri_window_manager.cc b/ui/ozone/platform/drm/host/drm_window_host_manager.cc
index 302d2227..8d2ba9e 100644
--- a/ui/ozone/platform/dri/dri_window_manager.cc
+++ b/ui/ozone/platform/drm/host/drm_window_host_manager.cc
@@ -2,34 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/dri_window_manager.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 
 #include "base/logging.h"
-#include "ui/ozone/platform/dri/dri_window.h"
+#include "ui/ozone/platform/drm/host/drm_window_host.h"
 
 namespace ui {
 
-DriWindowManager::DriWindowManager()
+DrmWindowHostManager::DrmWindowHostManager()
     : last_allocated_widget_(0), event_grabber_(gfx::kNullAcceleratedWidget) {
 }
 
-DriWindowManager::~DriWindowManager() {
+DrmWindowHostManager::~DrmWindowHostManager() {
 }
 
-gfx::AcceleratedWidget DriWindowManager::NextAcceleratedWidget() {
+gfx::AcceleratedWidget DrmWindowHostManager::NextAcceleratedWidget() {
   // We're not using 0 since other code assumes that a 0 AcceleratedWidget is an
   // invalid widget.
   return ++last_allocated_widget_;
 }
 
-void DriWindowManager::AddWindow(gfx::AcceleratedWidget widget,
-                                 DriWindow* window) {
+void DrmWindowHostManager::AddWindow(gfx::AcceleratedWidget widget,
+                                     DrmWindowHost* window) {
   std::pair<WidgetToWindowMap::iterator, bool> result = window_map_.insert(
-      std::pair<gfx::AcceleratedWidget, DriWindow*>(widget, window));
+      std::pair<gfx::AcceleratedWidget, DrmWindowHost*>(widget, window));
   DCHECK(result.second) << "Window for " << widget << " already added.";
 }
 
-void DriWindowManager::RemoveWindow(gfx::AcceleratedWidget widget) {
+void DrmWindowHostManager::RemoveWindow(gfx::AcceleratedWidget widget) {
   WidgetToWindowMap::iterator it = window_map_.find(widget);
   if (it != window_map_.end())
     window_map_.erase(it);
@@ -40,7 +40,7 @@ void DriWindowManager::RemoveWindow(gfx::AcceleratedWidget widget) {
     event_grabber_ = gfx::kNullAcceleratedWidget;
 }
 
-DriWindow* DriWindowManager::GetWindow(gfx::AcceleratedWidget widget) {
+DrmWindowHost* DrmWindowHostManager::GetWindow(gfx::AcceleratedWidget widget) {
   WidgetToWindowMap::iterator it = window_map_.find(widget);
   if (it != window_map_.end())
     return it->second;
@@ -49,7 +49,7 @@ DriWindow* DriWindowManager::GetWindow(gfx::AcceleratedWidget widget) {
   return NULL;
 }
 
-DriWindow* DriWindowManager::GetWindowAt(const gfx::Point& location) {
+DrmWindowHost* DrmWindowHostManager::GetWindowAt(const gfx::Point& location) {
   for (auto it = window_map_.begin(); it != window_map_.end(); ++it)
     if (it->second->GetBounds().Contains(location))
       return it->second;
@@ -57,18 +57,18 @@ DriWindow* DriWindowManager::GetWindowAt(const gfx::Point& location) {
   return NULL;
 }
 
-DriWindow* DriWindowManager::GetPrimaryWindow() {
+DrmWindowHost* DrmWindowHostManager::GetPrimaryWindow() {
   auto it = window_map_.begin();
   return it != window_map_.end() ? it->second : nullptr;
 }
 
-void DriWindowManager::GrabEvents(gfx::AcceleratedWidget widget) {
+void DrmWindowHostManager::GrabEvents(gfx::AcceleratedWidget widget) {
   if (event_grabber_ != gfx::kNullAcceleratedWidget)
     return;
   event_grabber_ = widget;
 }
 
-void DriWindowManager::UngrabEvents(gfx::AcceleratedWidget widget) {
+void DrmWindowHostManager::UngrabEvents(gfx::AcceleratedWidget widget) {
   if (event_grabber_ != widget)
     return;
   event_grabber_ = gfx::kNullAcceleratedWidget;
diff --git a/ui/ozone/platform/dri/dri_window_manager.h b/ui/ozone/platform/drm/host/drm_window_host_manager.h
index 1683a6f..1313340 100644
--- a/ui/ozone/platform/dri/dri_window_manager.h
+++ b/ui/ozone/platform/drm/host/drm_window_host_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_MANAGER_H_
-#define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_MANAGER_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_MANAGER_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_MANAGER_H_
 
 #include <map>
 
@@ -16,21 +16,21 @@ class Point;
 
 namespace ui {
 
-class DriGpuPlatformSupportHost;
-class DriWindow;
+class DrmGpuPlatformSupportHost;
+class DrmWindowHost;
 
 // Responsible for keeping the mapping between the allocated widgets and
 // windows.
-class DriWindowManager {
+class DrmWindowHostManager {
  public:
-  DriWindowManager();
-  ~DriWindowManager();
+  DrmWindowHostManager();
+  ~DrmWindowHostManager();
 
   gfx::AcceleratedWidget NextAcceleratedWidget();
 
   // Adds a window for |widget|. Note: |widget| should not be associated when
   // calling this function.
-  void AddWindow(gfx::AcceleratedWidget widget, DriWindow* window);
+  void AddWindow(gfx::AcceleratedWidget widget, DrmWindowHost* window);
 
   // Removes the window association for |widget|. Note: |widget| must be
   // associated with a window when calling this function.
@@ -38,13 +38,13 @@ class DriWindowManager {
 
   // Returns the window associated with |widget|. Note: This function should
   // only be called if a valid window has been associated.
-  DriWindow* GetWindow(gfx::AcceleratedWidget widget);
+  DrmWindowHost* GetWindow(gfx::AcceleratedWidget widget);
 
   // Returns the window containing the specified screen location, or NULL.
-  DriWindow* GetWindowAt(const gfx::Point& location);
+  DrmWindowHost* GetWindowAt(const gfx::Point& location);
 
   // Returns a window. Probably the first one created.
-  DriWindow* GetPrimaryWindow();
+  DrmWindowHost* GetPrimaryWindow();
 
   // Tries to set a given widget as the recipient for events. It will
   // fail if there is already another widget as recipient.
@@ -57,16 +57,16 @@ class DriWindowManager {
   gfx::AcceleratedWidget event_grabber() const { return event_grabber_; }
 
  private:
-  typedef std::map<gfx::AcceleratedWidget, DriWindow*> WidgetToWindowMap;
+  typedef std::map<gfx::AcceleratedWidget, DrmWindowHost*> WidgetToWindowMap;
 
   gfx::AcceleratedWidget last_allocated_widget_;
   WidgetToWindowMap window_map_;
 
   gfx::AcceleratedWidget event_grabber_;
 
-  DISALLOW_COPY_AND_ASSIGN(DriWindowManager);
+  DISALLOW_COPY_AND_ASSIGN(DrmWindowHostManager);
 };
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_MANAGER_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_DRM_WINDOW_HOST_MANAGER_H_
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 31d025b..9c0c817 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/ozone_platform_dri.h"
+#include "ui/ozone/platform/drm/ozone_platform_drm.h"
 
 #include "base/at_exit.h"
 #include "base/thread_task_runner_handle.h"
@@ -11,23 +11,23 @@
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
-#include "ui/ozone/platform/dri/display_manager.h"
-#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_cursor.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
-#include "ui/ozone/platform/dri/dri_surface_factory.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/dri_window.h"
-#include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/dri_window_manager.h"
-#include "ui/ozone/platform/dri/drm_device.h"
-#include "ui/ozone/platform/dri/drm_device_generator.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/native_display_delegate_dri.h"
-#include "ui/ozone/platform/dri/native_display_delegate_proxy.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/drm_surface_factory.h"
+#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/host/display_manager.h"
+#include "ui/ozone/platform/drm/host/drm_cursor.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
+#include "ui/ozone/platform/drm/host/drm_window_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 #include "ui/ozone/public/ozone_gpu_test_helper.h"
 #include "ui/ozone/public/ozone_platform.h"
 
@@ -42,19 +42,19 @@ namespace ui {
 
 namespace {
 
-// OzonePlatform for Linux DRI (Direct Rendering Infrastructure)
+// OzonePlatform for Linux DRM (Direct Rendering Manager)
 //
 // This platform is Linux without any display server (no X, wayland, or
 // anything). This means chrome alone owns the display and input devices.
-class OzonePlatformDri : public OzonePlatform {
+class OzonePlatformDrm : public OzonePlatform {
  public:
-  OzonePlatformDri()
+  OzonePlatformDrm()
       : drm_(new DrmDevice(GetPrimaryDisplayCardPath())),
-        buffer_generator_(new DriBufferGenerator()),
+        buffer_generator_(new DrmBufferGenerator()),
         screen_manager_(new ScreenManager(buffer_generator_.get())),
-        device_manager_(CreateDeviceManager()),
-        window_delegate_manager_() {}
-  ~OzonePlatformDri() override {}
+        window_delegate_manager_(),
+        device_manager_(CreateDeviceManager()) {}
+  ~OzonePlatformDrm() override {}
 
   // OzonePlatform:
   ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
@@ -78,15 +78,15 @@ class OzonePlatformDri : public OzonePlatform {
   scoped_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
-    scoped_ptr<DriWindow> platform_window(
-        new DriWindow(delegate, bounds, gpu_platform_support_host_.get(),
-                      event_factory_ozone_.get(), cursor_.get(),
-                      window_manager_.get(), display_manager_.get()));
+    scoped_ptr<DrmWindowHost> platform_window(
+        new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(),
+                          event_factory_ozone_.get(), cursor_.get(),
+                          window_manager_.get(), display_manager_.get()));
     platform_window->Initialize();
     return platform_window.Pass();
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
-    return make_scoped_ptr(new NativeDisplayDelegateProxy(
+    return make_scoped_ptr(new DrmNativeDisplayDelegate(
         gpu_platform_support_host_.get(), device_manager_.get(),
         display_manager_.get(), drm_->device_path()));
   }
@@ -100,18 +100,18 @@ class OzonePlatformDri : public OzonePlatform {
     drm_device_manager_.reset(new DrmDeviceManager(drm_));
     display_manager_.reset(new DisplayManager());
     surface_factory_ozone_.reset(
-        new DriSurfaceFactory(&window_delegate_manager_));
-    scoped_ptr<NativeDisplayDelegateDri> ndd(new NativeDisplayDelegateDri(
+        new DrmSurfaceFactory(&window_delegate_manager_));
+    scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
         screen_manager_.get(), drm_,
         scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
-    gpu_platform_support_.reset(new DriGpuPlatformSupport(
+    gpu_platform_support_.reset(new DrmGpuPlatformSupport(
         drm_device_manager_.get(), &window_delegate_manager_,
         screen_manager_.get(), ndd.Pass()));
-    gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
-    window_manager_.reset(new DriWindowManager());
+    gpu_platform_support_host_.reset(new DrmGpuPlatformSupportHost());
+    window_manager_.reset(new DrmWindowHostManager());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
     cursor_.reset(
-        new DriCursor(window_manager_.get(), gpu_platform_support_host_.get()));
+        new DrmCursor(window_manager_.get(), gpu_platform_support_host_.get()));
     cursor_->Init();
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
@@ -132,38 +132,39 @@ class OzonePlatformDri : public OzonePlatform {
   void InitializeGPU() override {}
 
  private:
+  // Objects in the "GPU" process.
   scoped_refptr<DrmDevice> drm_;
   scoped_ptr<DrmDeviceManager> drm_device_manager_;
-  scoped_ptr<DriBufferGenerator> buffer_generator_;
+  scoped_ptr<DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
-  scoped_ptr<DeviceManager> device_manager_;
+  scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
+  DrmWindowManager window_delegate_manager_;
 
-  scoped_ptr<DriSurfaceFactory> surface_factory_ozone_;
+  // Objects in the "Browser" process.
+  scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
-
-  scoped_ptr<DriCursor> cursor_;
-  scoped_ptr<DriWindowManager> window_manager_;
+  scoped_ptr<DrmCursor> cursor_;
+  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DisplayManager> display_manager_;
-
-  scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_;
-  scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_;
-
-  DriWindowDelegateManager window_delegate_manager_;
-
-  OzoneGpuTestHelper gpu_helper_;
+  scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
 
 #if defined(USE_XKBCOMMON)
   XkbEvdevCodes xkb_evdev_code_converter_;
 #endif
 
-  DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
+  // Objects on both processes.
+  scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
+
+  OzoneGpuTestHelper gpu_helper_;
+
+  DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformDri() {
-  return new OzonePlatformDri;
+  return new OzonePlatformDrm;
 }
 
 }  // namespace ui
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.h b/ui/ozone/platform/drm/ozone_platform_drm.h
index a63a054..c136890 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.h
+++ b/ui/ozone/platform/drm/ozone_platform_drm.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_DRI_H_
-#define UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_DRI_H_
+#ifndef UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_DRM_H_
+#define UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_DRM_H_
 
 namespace ui {
 
@@ -14,4 +14,4 @@ OzonePlatform* CreateOzonePlatformDri();
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_DRI_H_
+#endif  // UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_DRM_H_
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index 15d5466..1ef78dd 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/ozone_platform_gbm.h"
+#include "ui/ozone/platform/drm/ozone_platform_gbm.h"
 
 #include <dlfcn.h>
 #include <gbm.h>
@@ -15,24 +15,24 @@
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
-#include "ui/ozone/platform/dri/display_manager.h"
-#include "ui/ozone/platform/dri/dri_cursor.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
-#include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
-#include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/dri_window.h"
-#include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/dri_window_manager.h"
-#include "ui/ozone/platform/dri/drm_device_generator.h"
-#include "ui/ozone/platform/dri/drm_device_manager.h"
-#include "ui/ozone/platform/dri/gbm_buffer.h"
-#include "ui/ozone/platform/dri/gbm_device.h"
-#include "ui/ozone/platform/dri/gbm_surface.h"
-#include "ui/ozone/platform/dri/gbm_surface_factory.h"
-#include "ui/ozone/platform/dri/native_display_delegate_dri.h"
-#include "ui/ozone/platform/dri/native_display_delegate_proxy.h"
-#include "ui/ozone/platform/dri/scanout_buffer.h"
-#include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/platform/drm/gbm_surface_factory.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
+#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
+#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
+#include "ui/ozone/platform/drm/gpu/drm_util.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_manager.h"
+#include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
+#include "ui/ozone/platform/drm/gpu/gbm_device.h"
+#include "ui/ozone/platform/drm/gpu/gbm_surface.h"
+#include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
+#include "ui/ozone/platform/drm/gpu/screen_manager.h"
+#include "ui/ozone/platform/drm/host/display_manager.h"
+#include "ui/ozone/platform/drm/host/drm_cursor.h"
+#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
+#include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
+#include "ui/ozone/platform/drm/host/drm_window_host.h"
+#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
@@ -108,8 +108,7 @@ class GbmDeviceGenerator : public DrmDeviceGenerator {
 
 class OzonePlatformGbm : public OzonePlatform {
  public:
-  OzonePlatformGbm(bool use_surfaceless) : use_surfaceless_(use_surfaceless) {
-  }
+  OzonePlatformGbm(bool use_surfaceless) : use_surfaceless_(use_surfaceless) {}
   ~OzonePlatformGbm() override {}
 
   // OzonePlatform:
@@ -134,15 +133,15 @@ class OzonePlatformGbm : public OzonePlatform {
   scoped_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
-    scoped_ptr<DriWindow> platform_window(
-        new DriWindow(delegate, bounds, gpu_platform_support_host_.get(),
-                      event_factory_ozone_.get(), cursor_.get(),
-                      window_manager_.get(), display_manager_.get()));
+    scoped_ptr<DrmWindowHost> platform_window(
+        new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(),
+                          event_factory_ozone_.get(), cursor_.get(),
+                          window_manager_.get(), display_manager_.get()));
     platform_window->Initialize();
     return platform_window.Pass();
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
-    return make_scoped_ptr(new NativeDisplayDelegateProxy(
+    return make_scoped_ptr(new DrmNativeDisplayDelegate(
         gpu_platform_support_host_.get(), device_manager_.get(),
         display_manager_.get(), primary_graphics_card_path_));
   }
@@ -154,11 +153,11 @@ class OzonePlatformGbm : public OzonePlatform {
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
     device_manager_ = CreateDeviceManager();
-    gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
-    window_manager_.reset(new DriWindowManager());
+    gpu_platform_support_host_.reset(new DrmGpuPlatformSupportHost());
+    window_manager_.reset(new DrmWindowHostManager());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
     cursor_.reset(
-        new DriCursor(window_manager_.get(), gpu_platform_support_host_.get()));
+        new DrmCursor(window_manager_.get(), gpu_platform_support_host_.get()));
     cursor_->Init();
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
@@ -186,41 +185,42 @@ class OzonePlatformGbm : public OzonePlatform {
     // configuration can still use the primary display.
     ForceInitializationOfPrimaryDisplay(gbm_, screen_manager_.get());
 
-    window_delegate_manager_.reset(new DriWindowDelegateManager());
+    window_delegate_manager_.reset(new DrmWindowManager());
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
     surface_factory_ozone_->InitializeGpu(drm_device_manager_.get(),
                                           window_delegate_manager_.get());
-    scoped_ptr<NativeDisplayDelegateDri> ndd(new NativeDisplayDelegateDri(
+    scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
         screen_manager_.get(), gbm_,
         scoped_ptr<DrmDeviceGenerator>(new GbmDeviceGenerator())));
-    gpu_platform_support_.reset(new DriGpuPlatformSupport(
+    gpu_platform_support_.reset(new DrmGpuPlatformSupport(
         drm_device_manager_.get(), window_delegate_manager_.get(),
         screen_manager_.get(), ndd.Pass()));
   }
 
  private:
+  // Objects in both processes.
   bool use_surfaceless_;
-  base::FilePath primary_graphics_card_path_;
+  scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
+
+  // Objects in the GPU process.
   scoped_ptr<GlApiLoader> gl_api_loader_;
   scoped_refptr<GbmDevice> gbm_;
   scoped_ptr<DrmDeviceManager> drm_device_manager_;
   scoped_ptr<GbmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
-  scoped_ptr<DeviceManager> device_manager_;
+  scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
+  scoped_ptr<DrmWindowManager> window_delegate_manager_;
 
-  scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
+  // Obejcts in the Browser process.
+  base::FilePath primary_graphics_card_path_;
+  scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
-
-  scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_;
-  scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_;
-
-  scoped_ptr<DriWindowDelegateManager> window_delegate_manager_;
-  // Browser side object only.
-  scoped_ptr<DriCursor> cursor_;
-  scoped_ptr<DriWindowManager> window_manager_;
+  scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
+  scoped_ptr<DrmCursor> cursor_;
+  scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DisplayManager> display_manager_;
 
 #if defined(USE_XKBCOMMON)
diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.h b/ui/ozone/platform/drm/ozone_platform_gbm.h
index 47f5ca7..324535d9 100644
--- a/ui/ozone/platform/dri/ozone_platform_gbm.h
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_GBM_H_
-#define UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_GBM_H_
+#ifndef UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_GBM_H_
+#define UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_GBM_H_
 
 namespace ui {
 
@@ -14,4 +14,4 @@ OzonePlatform* CreateOzonePlatformGbm();
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_OZONE_PLATFORM_GBM_H_
+#endif  // UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_GBM_H_
diff --git a/ui/ozone/platform/dri/test/mock_drm_device.cc b/ui/ozone/platform/drm/test/mock_drm_device.cc
index 460ecbb..851e760 100644
--- a/ui/ozone/platform/dri/test/mock_drm_device.cc
+++ b/ui/ozone/platform/drm/test/mock_drm_device.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/platform/dri/test/mock_drm_device.h"
+#include "ui/ozone/platform/drm/test/mock_drm_device.h"
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "ui/ozone/platform/dri/hardware_display_plane_manager_legacy.h"
+#include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h"
 
 namespace ui {
 
diff --git a/ui/ozone/platform/dri/test/mock_drm_device.h b/ui/ozone/platform/drm/test/mock_drm_device.h
index d3268e1..3980bf7 100644
--- a/ui/ozone/platform/dri/test/mock_drm_device.h
+++ b/ui/ozone/platform/drm/test/mock_drm_device.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRM_DEVICE_H_
-#define UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRM_DEVICE_H_
+#ifndef UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_
+#define UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_
 
 #include <queue>
 #include <vector>
 
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "ui/ozone/platform/dri/drm_device.h"
+#include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
@@ -131,4 +131,4 @@ class MockDrmDevice : public ui::DrmDevice {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRI_TEST_MOCK_DRM_DEVICE_H_
+#endif  // UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_