Relocate display_snapshot_mojo

Keeping DisplaySnapshotMojo in display/types enables tighter use of
DEPS in ozone/platform/drm so relocate it appropriately.

BUG=620927

Review-Url: https://codereview.chromium.org/2738043004
Cr-Commit-Position: refs/heads/master@{#456235}

ui/display/BUILD.gn

@@ -22,8 +22,6 @@ component("display") {
     "display_list.h",
     "display_observer.cc",
     "display_observer.h",
-    "display_snapshot_mojo.cc",
-    "display_snapshot_mojo.h",
     "display_switches.cc",
     "display_switches.h",
     "fake_display_delegate.cc",

ui/display/mojo/display_snapshot_mojo.typemap

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 mojom = "//ui/display/mojo/display_snapshot_mojo.mojom"
-public_headers = [ "//ui/display/display_snapshot_mojo.h" ]
+public_headers = [ "//ui/display/types/display_snapshot_mojo.h" ]
 traits_headers = [ "//ui/display/mojo/display_snapshot_mojo_struct_traits.h" ]
 sources = [
   "//ui/display/mojo/display_snapshot_mojo_struct_traits.cc",

ui/display/mojo/display_snapshot_mojo_struct_traits.h

@@ -5,9 +5,9 @@
 #ifndef UI_DISPLAY_MOJO_DISPLAY_SNAPSHOT_MOJO_STRUCT_TRAITS_H_
 #define UI_DISPLAY_MOJO_DISPLAY_SNAPSHOT_MOJO_STRUCT_TRAITS_H_
 
-#include "ui/display/display_snapshot_mojo.h"
 #include "ui/display/mojo/display_snapshot_mojo.mojom.h"
 #include "ui/display/types/display_mode.h"
+#include "ui/display/types/display_snapshot_mojo.h"
 
 namespace mojo {
 

ui/display/mojo/display_struct_traits_unittest.cc

@@ -10,10 +10,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
-#include "ui/display/display_snapshot_mojo.h"
 #include "ui/display/mojo/display_struct_traits_test.mojom.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/display_mode.h"
+#include "ui/display/types/display_snapshot_mojo.h"
 #include "ui/display/types/gamma_ramp_rgb_entry.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"

ui/display/types/BUILD.gn

@@ -10,6 +10,8 @@ component("types") {
     "display_mode.h",
     "display_snapshot.cc",
     "display_snapshot.h",
+    "display_snapshot_mojo.cc",
+    "display_snapshot_mojo.h",
     "display_types_export.h",
     "fake_display_controller.h",
     "gamma_ramp_rgb_entry.h",

ui/display/display_snapshot_mojo.cc → ui/display/types/display_snapshot_mojo.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/display/display_snapshot_mojo.h"
+#include "ui/display/types/display_snapshot_mojo.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/display/types/display_constants.h"

ui/display/display_snapshot_mojo.h → ui/display/types/display_snapshot_mojo.h

@@ -8,13 +8,13 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "ui/display/display_export.h"
 #include "ui/display/types/display_snapshot.h"
+#include "ui/display/types/display_types_export.h"
 
 namespace display {
 
 // DisplaySnapshot implementation that can be used with Mojo IPC.
-class DISPLAY_EXPORT DisplaySnapshotMojo : public DisplaySnapshot {
+class DISPLAY_TYPES_EXPORT DisplaySnapshotMojo : public DisplaySnapshot {
  public:
   DisplaySnapshotMojo(int64_t display_id,
                       const gfx::Point& origin,