Make ViewRoot the top of the ViewAndroid tree

ui/android/display_android_manager.h

Index: ui/android/display_android_manager.h
diff --git a/ui/android/display_android_manager.h b/ui/android/display_android_manager.h
index 9eae6fac7383d25f316096e608828bd690412835..95024b2346ca6359498232614dd3d1163d95f29a 100644
--- a/ui/android/display_android_manager.h
+++ b/ui/android/display_android_manager.h
@@ -9,17 +9,23 @@
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
+#include "ui/android/ui_android_export.h"
 #include "ui/display/screen_base.h"
 
 namespace ui {
 
-class DisplayAndroidManager : public display::ScreenBase {
+class UI_ANDROID_EXPORT DisplayAndroidManager : public display::ScreenBase {

[boliu, 2017/02/13 22:58:08]

does this need to be made public, if GetDisplayNearestWindowAndroid is being
added to Screen already?

[Jinsuk Kim, 2017/02/14 05:09:59]

Not any more. Removed.

  public:
   ~DisplayAndroidManager() override;
 
+  // Prefer using |Screen::GetScreen()|. Only use this to avoid casting.
+  static DisplayAndroidManager* GetInstance();
+
   // Screen interface.
 
   display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestWindowAndroid(
+      gfx::NativeWindow window) const override;
   display::Display GetDisplayNearestPoint(
       const gfx::Point& point) const override;
   display::Display GetDisplayMatching(