diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 06:55:09 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 06:55:09 +0000 |
| commit | a6147a2157592761fd071b91b87d65f63baf0f5b (patch) | |
| tree | b65ae215f3fde65c431d97a3a1fa880f21d549a3 /ash | |
| parent | df9430603f01bc5710ab44cec32c3b60e45c459c (diff) | |
| download | chromium_src-a6147a2157592761fd071b91b87d65f63baf0f5b.zip chromium_src-a6147a2157592761fd071b91b87d65f63baf0f5b.tar.gz chromium_src-a6147a2157592761fd071b91b87d65f63baf0f5b.tar.bz2 | |
events: Move all references to ui/base/ from ui/events.
Notable changes:
* Move TouchFactory from ui/base/ into ui/events/x/.
* Split out some switches from ui/base/ into ui/events/.
* Move SequentialIDGenerator from ui/base/ into ui/gfx/.
BUG=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/24692003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 2 | ||||
| -rw-r--r-- | ash/wm/system_gesture_event_filter.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 06473f2..46575ae 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -34,7 +34,7 @@ #include "ui/views/test/test_views_delegate.h" #if defined(USE_X11) -#include "ui/base/touch/touch_factory_x11.h" +#include "ui/events/x/touch_factory_x11.h" #endif #if defined(OS_CHROMEOS) diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 98e5abf..e38b14d 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -21,7 +21,7 @@ #include "ui/events/event.h" #if defined(OS_CHROMEOS) -#include "ui/base/touch/touch_factory_x11.h" +#include "ui/events/x/touch_factory_x11.h" #endif namespace { |