Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/native_viewport/platform_viewport_x11.cc

 // Copyright 2013 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 "components/view_manager/native_viewport/platform_viewport.h"
 
 #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"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/platform_window/x11/x11_window.h"
@@ skipping 23 matching lines @@
   }
 
  private:
   // Overridden from PlatformViewport:
   void Init(const gfx::Rect& bounds) override {
     CHECK(!platform_window_);
 
     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);
   }
 
   void Show() override { platform_window_->Show(); }
 
   void Hide() override { platform_window_->Hide(); }
 
   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);
   }
 
   // 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 {}
 
   void DispatchEvent(ui::Event* event) override {
     mojo::EventPtr mojo_event(mojo::Event::From(*event));
     if (event->IsMouseWheelEvent()) {
       // Mojo's event type has a different meaning for wheel events. Convert
       // between the two.
       ui::MouseWheelEvent* wheel_event =
@@ skipping 67 matching lines @@
   void OnActivationChanged(bool active) override {}
 
   scoped_ptr<ui::PlatformWindow> platform_window_;
   Delegate* delegate_;
   mojo::ViewportMetricsPtr metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11);
 };
 
 // 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));
 }
 
 }  // namespace native_viewport