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..8f5353e5a31bbc1779b4b3c5feeea6e459e45cb6 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/android/native_widget_android.h" |
+#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); |
sadrul
2015/11/18 20:07:39
s/Desktop//
bshe
2015/11/18 20:57:53
hah. I should really upstream everything asap to b
|
+#else |
params->native_widget = new views::DesktopNativeWidgetAura(delegate); |
+#endif |
} |
} |
#endif |