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

Unified Diff: ui/base/layout.cc

Issue 10440037: Remove the enable_metro GYP flag, effectively making it on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 9e6be4031874c0ab3fb129ee163db44c26dfe73f..36614fa825b3f2bb5dab8c7e7e70c6277d01e008 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -41,11 +41,10 @@ bool UseTouchOptimizedUI() {
}
}
-#if defined(ENABLE_METRO)
+#if defined(OS_WIN)
+ // On Windows, we use the touch layout only when we are running in
+ // Metro mode.
return base::win::GetMetroModule() != NULL;
-#elif defined(OS_WIN)
- // No touch support on Win outside Metro yet (even with Aura).
- return false;
#elif defined(USE_AURA) && defined(USE_X11)
// Determine whether touch-screen hardware is currently available.
// For now we assume this won't change over the life of the process, but
« chrome/installer/mini_installer.gyp ('K') | « chrome/tools/build/win/create_installer_archive.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698