Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: ui/views/test/test_views_delegate_aura.cc

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/platform_window/android/platform_window_jni_registrar.cc ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/test_views_delegate_aura.cc
diff --git a/ui/views/test/test_views_delegate_aura.cc b/ui/views/test/test_views_delegate_aura.cc
index ccd2bb2a4cbf5e5927cb33be4f5a2863469367da..85d2f4e37e6c9a6a95da015f0682f622b73628d7 100644
--- a/ui/views/test/test_views_delegate_aura.cc
+++ b/ui/views/test/test_views_delegate_aura.cc
@@ -7,9 +7,9 @@
#include "ui/aura/env.h"
#include "ui/wm/core/wm_state.h"
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#endif // !defined(OS_CHROMEOS)
+#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
namespace views {
@@ -40,7 +40,7 @@ void TestViewsDelegate::OnBeforeWidgetInit(
Widget::InitParams::TRANSLUCENT_WINDOW :
Widget::InitParams::OPAQUE_WINDOW;
}
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
if (!params->native_widget && use_desktop_native_widgets_)
params->native_widget = new DesktopNativeWidgetAura(delegate);
#endif // !defined(OS_CHROMEOS)
« no previous file with comments | « ui/platform_window/android/platform_window_jni_registrar.cc ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698