Reland of Android: support multiple displays on C++ side

ui/android/display_android_manager.h

+// Copyright 2016 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_ANDROID_DISPLAY_ANDROID_MANAGER_H_
+#define UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_
+
+#include <jni.h>
+#include <map>
+
+#include "base/android/jni_android.h"
+#include "base/macros.h"
+#include "ui/display/screen.h"
+
+namespace ui {
+
+class DisplayAndroidManager : public display::Screen {

[boliu, 2016/11/12 00:34:13]

this doesn't need a header file I thought, just put the declaration in the cc
file as well?

[Tima Vaisburd, 2016/11/12 01:57:27]

display_android_manager.cc did not compile without this separation:

#include "jni/DisplayAndroidManager_jni.h"

The file DisplayAndroidManager_jni.h references DisplayAndroidManager, e.g.

 DisplayAndroidManager* native =
      reinterpret_cast<DisplayAndroidManager*>(nativeDisplayAndroidManager);
  return native->UpdateDisplay([...]);

and complains it does not know what DisplayAndroidManager is.

+ public:
+  DisplayAndroidManager();
+  ~DisplayAndroidManager() override;
+
+  // Screen interface.
+
+  gfx::Point GetCursorScreenPoint() override;
+  bool IsWindowUnderCursor(gfx::NativeWindow window) override;
+  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
+  int GetNumDisplays() const override;
+  std::vector<display::Display> GetAllDisplays() const override;
+  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestPoint(
+      const gfx::Point& point) const override;
+  display::Display GetDisplayMatching(
+      const gfx::Rect& match_rect) const override;
+  display::Display GetPrimaryDisplay() const override;
+  void AddObserver(display::DisplayObserver* observer) override;
+  void RemoveObserver(display::DisplayObserver* observer) override;
+
+  // Methods called from Java.
+
+  void UpdateDisplay(JNIEnv* env,
+                     const base::android::JavaParamRef<jobject>& jobject,
+                     jint sdkDisplayId,
+                     jint physicalWidth,
+                     jint physicalHeight,
+                     jint width,
+                     jint height,
+                     jfloat dipScale,
+                     jint rotationDegrees,
+                     jint bitsPerPixel,
+                     jint bitsPerComponent);
+  void RemoveDisplay(JNIEnv* env,
+                     const base::android::JavaParamRef<jobject>& jobject,
+                     jint sdkDisplayId);
+  void SetPrimaryDisplayId(JNIEnv* env,
+                           const base::android::JavaParamRef<jobject>& jobject,
+                           jint sdkDisplayId);
+
+ private:
+  using DisplayMap = std::map<int, display::Display>;
+  DisplayMap displays_;
+  int primary_display_id_ = 0;
+
+  DISALLOW_COPY_AND_ASSIGN(DisplayAndroidManager);
+};
+
+}  // namespace ui
+
+#endif  // UI_ANDROID_DISPLAY_ANDROID_MANAGER_H_