diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 18:11:54 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 18:11:54 +0000 |
| commit | 86ccbd412375d364cd2e1ea6fabbe696998828fe (patch) | |
| tree | 4891f52890bbc3a39983b25229660a4822b1412a /ash/magnifier | |
| parent | c51461c08853fd38c3eccda1646cfcc3ceff7b06 (diff) | |
| download | chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.zip chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.gz chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.bz2 | |
Moves ui/base/events to ui/events
BUG=none
TEST=none
R=ben@chromium.org
TBR=brettw@chromium.org, scherkus@chromium.org, ananta@chromium.org,
Review URL: https://codereview.chromium.org/23851041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 4 | ||||
| -rw-r--r-- | ash/magnifier/partial_magnification_controller.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 02a2a8b..c2e269d 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -14,12 +14,12 @@ #include "ui/aura/root_window_transformer.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point3_f.h" #include "ui/gfx/point_conversions.h" #include "ui/gfx/point_f.h" diff --git a/ash/magnifier/partial_magnification_controller.h b/ash/magnifier/partial_magnification_controller.h index 1b8c8fb..54c15f3 100644 --- a/ash/magnifier/partial_magnification_controller.h +++ b/ash/magnifier/partial_magnification_controller.h @@ -6,7 +6,7 @@ #define ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_ #include "ui/aura/window_observer.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/point.h" #include "ui/views/widget/widget_observer.h" |