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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1594403003: Remove more ifdefs and TODOs that were added for Aura Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months 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
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 72f24013ba6cce44e1866d5699f7c2ec34928011..2670cd219ad43f5efd55dacfb1757ca2a12e4a7b 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -53,10 +53,6 @@
#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"
@@ -433,11 +429,7 @@ 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::NativeWidgetAndroid(delegate);
-#else
params->native_widget = new views::DesktopNativeWidgetAura(delegate);
-#endif
}
}
#endif
« no previous file with comments | « no previous file | ui/views/widget/android/native_widget_android.cc » ('j') | ui/views/widget/android/native_widget_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698