summaryrefslogtreecommitdiffstats
path: root/ui/base/layout.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 22:52:52 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 22:52:52 +0000
commit0e88cbea52e478a9f6a2f63d9e2dee06c1b39de9 (patch)
tree2e5aaf68d7f3e6c5d87bd30c1afd522ad9698045 /ui/base/layout.cc
parentaa752c3f3c06918c0d684044c8418d3a6f33c37c (diff)
downloadchromium_src-0e88cbea52e478a9f6a2f63d9e2dee06c1b39de9.zip
chromium_src-0e88cbea52e478a9f6a2f63d9e2dee06c1b39de9.tar.gz
chromium_src-0e88cbea52e478a9f6a2f63d9e2dee06c1b39de9.tar.bz2
Use touch friendly window buttons in aura when using --touch-optimized-ui.
I have increased the padding in the assets used for the buttons when running with touch optimized ui enabled. BUG=115520 TEST=Run with --touch-optimized-ui and verify that maximize and close buttons are large and all assets look correct. Review URL: http://codereview.chromium.org/10159002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/layout.cc')
-rw-r--r--ui/base/layout.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 9dff5c2..8da1fcb 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -7,6 +7,11 @@
#include "base/basictypes.h"
#include "build/build_config.h"
+#if defined(USE_ASH)
+#include "base/command_line.h"
+#include "ui/base/ui_base_switches.h"
+#endif
+
#if defined(OS_WIN)
#include "base/win/metro.h"
#include <Windows.h>
@@ -19,6 +24,8 @@ namespace ui {
// Windows.
DisplayLayout GetDisplayLayout() {
#if defined(USE_ASH)
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTouchOptimizedUI))
+ return LAYOUT_TOUCH;
return LAYOUT_ASH;
#elif !defined(OS_WIN)
return LAYOUT_DESKTOP;