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

ui/android/window_android.h

Index: ui/android/window_android.h
diff --git a/ui/android/window_android.h b/ui/android/window_android.h
index b55ba16cfa2c4cd36cddf0ad33951e98363326fa..6cc36ca421b0ae374fb6bfc99b7ffb58f99728e7 100644
--- a/ui/android/window_android.h
+++ b/ui/android/window_android.h
@@ -16,8 +16,13 @@
 #include "base/time/time.h"
 #include "ui/android/ui_android_export.h"
 #include "ui/android/view_android.h"
+#include "ui/display/display.h"

[boliu, 2016/11/01 17:11:04]

not necessary?

[Tima Vaisburd, 2016/11/01 23:04:36]

Removed.

 #include "ui/gfx/geometry/vector2d_f.h"
 
+namespace display {
+class DisplayAndroidManager;
+}
+
 namespace ui {
 
 class WindowAndroidCompositor;
@@ -27,7 +32,7 @@ class WindowAndroidObserver;
 // WindowAndroid is also the root of a ViewAndroid tree.
 class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
  public:
-  WindowAndroid(JNIEnv* env, jobject obj);
+  WindowAndroid(JNIEnv* env, jobject obj, int display_id);
 
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
@@ -80,12 +85,18 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
   void DestroyForTesting();
 
  private:
+  friend class display::DisplayAndroidManager;
+
   ~WindowAndroid() override;
 
   // ViewAndroid overrides.
   WindowAndroid* GetWindowAndroid() const override;
 
+  // The ID of the display that this window belongs to.
+  int display_id() const { return display_id_; }
+
   base::android::ScopedJavaGlobalRef<jobject> java_window_;
+  int display_id_;

[boliu, 2016/11/01 17:11:04]

const?

[Tima Vaisburd, 2016/11/01 23:04:36]

Done.

   gfx::Vector2dF content_offset_;
   WindowAndroidCompositor* compositor_;