Introduce AndroidFocusRules and NativeWidgetAndroid

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index f7efbac74c2e794339c6c16fdd2d4b342eb54fb0..898f8ee0be92ce5bdcc0fc0840f02087c908a7ba 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -52,6 +52,10 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "ui/views/widget/desktop_android/desktop_native_widget_android.h"

[sky, 2015/11/18 19:11:06]

Fix this and 412.

[bshe, 2015/11/18 19:29:52]

dooh. Sorry I missed this one.

+#endif
+
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
@@ -404,7 +408,11 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
         params->context ? params->context : params->parent;
     if (chrome::GetHostDesktopTypeForNativeView(to_check) ==
         chrome::HOST_DESKTOP_TYPE_NATIVE) {
+#if defined(OS_ANDROID)
+      params->native_widget = new views::DesktopNativeWidgetAndroid(delegate);
+#else
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
+#endif
     }
   }
 #endif