diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 00:08:14 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-05 00:08:14 +0000 |
| commit | 3a6ec5118e69446c76e0e034171ac16c3693c997 (patch) | |
| tree | 2e5b7e5065064bb0bd2812f03eb9261e595f6221 /ui/base/touch | |
| parent | d93461dbf46fcfb05b17647067c136500904e909 (diff) | |
| download | chromium_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 'ui/base/touch')
| -rw-r--r-- | ui/base/touch/touch_device_aurax11.cc | 2 | ||||
| -rw-r--r-- | ui/base/touch/touch_factory_x11.cc (renamed from ui/base/touch/touch_factory.cc) | 2 | ||||
| -rw-r--r-- | ui/base/touch/touch_factory_x11.h (renamed from ui/base/touch/touch_factory.h) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ui/base/touch/touch_device_aurax11.cc b/ui/base/touch/touch_device_aurax11.cc index 963503c..9c611f5 100644 --- a/ui/base/touch/touch_device_aurax11.cc +++ b/ui/base/touch/touch_device_aurax11.cc @@ -4,7 +4,7 @@ #include "ui/aura/window.h" #include "ui/base/touch/touch_device.h" -#include "ui/base/touch/touch_factory.h" +#include "ui/base/touch/touch_factory_x11.h" namespace ui { diff --git a/ui/base/touch/touch_factory.cc b/ui/base/touch/touch_factory_x11.cc index 1b1c42d..24315a2 100644 --- a/ui/base/touch/touch_factory.cc +++ b/ui/base/touch/touch_factory_x11.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/touch/touch_factory.h" +#include "ui/base/touch/touch_factory_x11.h" #include <X11/cursorfont.h> #include <X11/extensions/XInput.h> diff --git a/ui/base/touch/touch_factory.h b/ui/base/touch/touch_factory_x11.h index 3e29660..af0c632 100644 --- a/ui/base/touch/touch_factory.h +++ b/ui/base/touch/touch_factory_x11.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_TOUCH_TOUCH_FACTORY_H_ -#define UI_BASE_TOUCH_TOUCH_FACTORY_H_ +#ifndef UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ +#define UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ #include <bitset> #include <map> @@ -130,4 +130,4 @@ class UI_EXPORT TouchFactory { } // namespace ui -#endif // UI_BASE_TOUCH_TOUCH_FACTORY_H_ +#endif // UI_BASE_TOUCH_TOUCH_FACTORY_X11_H_ |