Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/native_viewport/platform_viewport_x11.cc

Index: components/view_manager/native_viewport/platform_viewport_x11.cc
diff --git a/components/view_manager/native_viewport/platform_viewport_x11.cc b/components/view_manager/native_viewport/platform_viewport_x11.cc
index c661fb5c09edd68517aabb711d8fca8b8efccf2c..d0f6976700b6dc6100746135261c4646eec05033 100644
--- a/components/view_manager/native_viewport/platform_viewport_x11.cc
+++ b/components/view_manager/native_viewport/platform_viewport_x11.cc
@@ -6,8 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
-#include "components/view_manager/native_viewport/platform_viewport_headless.h"
-#include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
@@ -51,7 +49,7 @@
     metrics_ = mojo::ViewportMetrics::New();
     // TODO(sky): make density real.
     metrics_->device_pixel_ratio = 1.f;
-    metrics_->size_in_pixels = mojo::Size::From(bounds.size());
+    metrics_->size = mojo::Size::From(bounds.size());
 
     platform_window_.reset(new ui::X11Window(this));
     platform_window_->SetBounds(bounds);
@@ -63,9 +61,7 @@
 
   void Close() override { platform_window_->Close(); }
 
-  gfx::Size GetSize() override {
-    return metrics_->size_in_pixels.To<gfx::Size>();
-  }
+  gfx::Size GetSize() override { return metrics_->size.To<gfx::Size>(); }
 
   void SetBounds(const gfx::Rect& bounds) override {
     platform_window_->SetBounds(bounds);
@@ -73,9 +69,8 @@
 
   // ui::PlatformWindowDelegate:
   void OnBoundsChanged(const gfx::Rect& new_bounds) override {
-    // TODO(fsamuel): Use the real device_scale_factor.
-    delegate_->OnMetricsChanged(new_bounds.size(),
-                                1.f /* device_scale_factor */);
+    metrics_->size = mojo::Size::From(new_bounds.size());
+    delegate_->OnMetricsChanged(metrics_.Clone());
   }
 
   void OnDamageRect(const gfx::Rect& damaged_region) override {}
@@ -163,10 +158,7 @@
 };
 
 // static
-scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate,
-                                                      bool headless) {
-  if (headless)
-    return PlatformViewportHeadless::Create(delegate);
+scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
   return make_scoped_ptr(new PlatformViewportX11(delegate));
 }