summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 00:08:14 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-05 00:08:14 +0000
commit3a6ec5118e69446c76e0e034171ac16c3693c997 (patch)
tree2e5b7e5065064bb0bd2812f03eb9261e595f6221 /ash/shell
parentd93461dbf46fcfb05b17647067c136500904e909 (diff)
downloadchromium_src-3a6ec5118e69446c76e0e034171ac16c3693c997.zip
chromium_src-3a6ec5118e69446c76e0e034171ac16c3693c997.tar.gz
chromium_src-3a6ec5118e69446c76e0e034171ac16c3693c997.tar.bz2
x11: Rename touch_factory to touch_factory_x11.
With this filename change, the files will be auto-excluded from non-x11 builds. BUG=none TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/13661002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/content_client/shell_browser_main_parts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index cb5975f..f413bae 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -36,7 +36,7 @@
#endif
#if defined(OS_LINUX)
-#include "ui/base/touch/touch_factory.h"
+#include "ui/base/touch/touch_factory_x11.h"
#endif
#if defined(OS_CHROMEOS)