diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:34:16 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:34:16 +0000 |
| commit | 46971929dc97fe73051c409b3276ba494901e64b (patch) | |
| tree | cf2583a6c37bafcc6b585e3ee49561fc5744c4d8 /ui | |
| parent | 3ea38a8008900b4a6504e7e4f8c47e38c94c9ec6 (diff) | |
| download | chromium_src-46971929dc97fe73051c409b3276ba494901e64b.zip chromium_src-46971929dc97fe73051c409b3276ba494901e64b.tar.gz chromium_src-46971929dc97fe73051c409b3276ba494901e64b.tar.bz2 | |
Remove the enable_metro GYP flag, effectively making it on by default.
The flag was mostly redundant with the enable_touch_ui flag, the only
additional effect of turning it on was to change the behavior of
ui::GetDisplayLayout.
If we later wanted to duplicate the effect that disabling the
enable_metro flag prior to this change would have, we can simply
change the condition in common.gypi that determines whether to turn on
the enable_touch_ui flag.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10440037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/layout.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index 9e6be40..36614fa 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 |