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

Unified Diff: ui/native_theme/native_theme_android.cc

Issue 139623002: Tweaks to get views compiling with mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mismatch Created 6 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
« no previous file with comments | « no previous file | ui/views/corewm/transient_window_stacking_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/native_theme_android.cc
diff --git a/ui/native_theme/native_theme_android.cc b/ui/native_theme/native_theme_android.cc
index 884bc7e356154a3cc92b7c6d1d35a8af479e8295..5fe2632a7e4ab66d9f0c6a1922955d0e02203cd9 100644
--- a/ui/native_theme/native_theme_android.cc
+++ b/ui/native_theme/native_theme_android.cc
@@ -9,10 +9,12 @@
namespace ui {
+#if !defined(USE_AURA)
// static
NativeTheme* NativeTheme::instance() {
return NativeThemeAndroid::instance();
}
+#endif
// static
NativeThemeAndroid* NativeThemeAndroid::instance() {
« no previous file with comments | « no previous file | ui/views/corewm/transient_window_stacking_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698