Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/native_viewport/platform_viewport_android.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_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
-#include "components/view_manager/native_viewport/platform_viewport_headless.h"
 #include "jni/PlatformViewportAndroid_jni.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace native_viewport {
 namespace {
 
@@ skipping 70 matching lines @@
   DCHECK(window_);
   delegate_->OnAcceleratedWidgetDestroyed();
   ReleaseWindow();
 }
 
 void PlatformViewportAndroid::SurfaceSetSize(JNIEnv* env,
                                              jobject obj,
                                              jint width,
                                              jint height,
                                              jfloat density) {
-  size_ = gfx::Size(static_cast<int>(width), static_cast<int>(height));
-  delegate_->OnMetricsChanged(size_, density);
+  metrics_ = mojo::ViewportMetrics::New();
+  metrics_->size = mojo::Size::New();
+  metrics_->size->width = static_cast<int>(width);
+  metrics_->size->height = static_cast<int>(height);
+  metrics_->device_pixel_ratio = density;
+  delegate_->OnMetricsChanged(metrics_.Clone());
 }
 
 bool PlatformViewportAndroid::TouchEvent(JNIEnv* env,
                                          jobject obj,
                                          jlong time_ms,
                                          jint masked_action,
                                          jint pointer_id,
                                          jfloat x,
                                          jfloat y,
                                          jfloat pressure,
@@ skipping 65 matching lines @@
 }
 
 void PlatformViewportAndroid::Close() {
   // TODO(beng): close activity containing MojoView?
 
   // TODO(beng): perform this in response to view destruction.
   delegate_->OnDestroyed();
 }
 
 gfx::Size PlatformViewportAndroid::GetSize() {
-  return size_;
+  return metrics_->size.To<gfx::Size>();
 }
 
 void PlatformViewportAndroid::SetBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewportAndroid, private:
 
 void PlatformViewportAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformViewport, public:
 
 // static
-scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate,
-                                                      bool headless) {
-  if (headless)
-    return PlatformViewportHeadless::Create(delegate);
-
+scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
   return scoped_ptr<PlatformViewport>(
       new PlatformViewportAndroid(delegate)).Pass();
 }
 
 }  // namespace native_viewport