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/launcher | |
| 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/launcher')
| -rw-r--r-- | ash/launcher/launcher_button.cc | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.cc | 4 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.h | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager_unittest.cc | 6 | ||||
| -rw-r--r-- | ash/launcher/launcher_view_unittest.cc | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index 6b9dedd..38b166f2 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -12,10 +12,10 @@ #include "grit/ash_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "ui/base/events/event_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_constants.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc index 901330a..5e99167 100644 --- a/ash/launcher/launcher_tooltip_manager.cc +++ b/ash/launcher/launcher_tooltip_manager.cc @@ -15,8 +15,8 @@ #include "base/timer/timer.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/gfx/insets.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h index 1e2ff3a..4b5bfc6 100644 --- a/ash/launcher/launcher_tooltip_manager.h +++ b/ash/launcher/launcher_tooltip_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index be07208..b0f2289 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -15,9 +15,9 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_handler.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/widget/widget.h" diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index eb5e420..4fc7d7a 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -33,10 +33,10 @@ #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/views/view_model.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" |