diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
| commit | dd131d3723dee3050b746319e437514d8fdb6bb1 (patch) | |
| tree | c44435187d6d4df51dcf5e02b31be151de270390 /ash/wm/dock | |
| parent | 2c6e3b04ca361d052f1e8fdc70983bcc7c379dba (diff) | |
| download | chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.zip chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.gz chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.bz2 | |
Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."
> Cleanups for aura/test/event_generator.h (resolve TODOs)
>
> Some purely mechanical changes left over from r283694, now that
> aura::test::EventGenerator has moved to ui::test in src/ui/events.
>
> Moves aura/test/event_generator.* to event_generator_delegate_aura.*
> Removes `using ui::test::EventGenerator;` declaration and redirects
> includes that don't extend the delegate to include the ui/test
> event_generator.h directly
>
> BUG=378134
>
> Review URL: https://codereview.chromium.org/406413004
TBR=tapted@chromium.org
Review URL: https://codereview.chromium.org/413983006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/dock')
| -rw-r--r-- | ash/wm/dock/docked_window_resizer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 98c70b0..82489dc 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -28,11 +28,11 @@ #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/window_tree_client.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/events/test/event_generator.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/window_util.h" @@ -1588,7 +1588,7 @@ TEST_P(DockedWindowResizerTest, MaximizedDuringDrag) { // ToplevelWindowEventHandler::ScopedWindowResizer::OnWindowStateTypeChanged() // must be called in order for the maximized window's size to be correct. delegate()->set_window_component(HTCAPTION); - ui::test::EventGenerator& generator = GetEventGenerator(); + aura::test::EventGenerator& generator = GetEventGenerator(); generator.MoveMouseTo(window->GetBoundsInScreen().origin()); generator.PressLeftButton(); generator.MoveMouseBy(10, 10); |