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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/platform_util.h

Issue 1478493004: Aura Android: upstream platform_util* related files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/platform_util_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/platform_util.h
diff --git a/chrome/browser/platform_util.h b/chrome/browser/platform_util.h
index 6c46b4dba3af1be451d56efc0503b5d664ff7368..651ae89611e9fa13f5d51142a3965b4a13a46c38 100644
--- a/chrome/browser/platform_util.h
+++ b/chrome/browser/platform_util.h
@@ -98,7 +98,7 @@ bool IsVisible(gfx::NativeView view);
bool IsSwipeTrackingFromScrollEventsEnabled();
#endif
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
bool RegisterPlatformUtil(JNIEnv* env);
#endif
} // namespace platform_util
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/platform_util_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698