diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 18:15:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 18:15:23 +0000 |
| commit | 0e46c2782de8924ca473e96dcba2e800f31e47a2 (patch) | |
| tree | 661244985c8e14e8ce41f591cd4b8ebb40d22908 /ash/drag_drop | |
| parent | 211a4a4eff8cb6b693a3cb2e3bf50df599c5184c (diff) | |
| download | chromium_src-0e46c2782de8924ca473e96dcba2e800f31e47a2.zip chromium_src-0e46c2782de8924ca473e96dcba2e800f31e47a2.tar.gz chromium_src-0e46c2782de8924ca473e96dcba2e800f31e47a2.tar.bz2 | |
aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/.
All of InputMethodEventFilter and more than half of
RootWindowEventFilter were copied verbatim to a
DesktopRootWindowEventFilter. Instead of copying the other half for
another patch, I'm just moving RWEF and deleting the desktop version.
(InputMethodEventFilterUnittest was simple enough to move with the
file, but RootWindowEventFilter seems to act more like an integraiton
test of a lot of the stuff on Shell.)
BUG=125106
Review URL: https://chromiumcodereview.appspot.com/10332145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 94b482a..9a6fdf6 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -6,11 +6,11 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/root_window_event_filter.h" #include "base/location.h" #include "base/utf_string_conversions.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" +#include "ui/aura/shared/root_window_event_filter.h" #include "ui/aura/test/event_generator.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" |