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/ime | |
| 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/ime')
| -rw-r--r-- | ash/ime/candidate_view_unittest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ash/ime/candidate_view_unittest.cc b/ash/ime/candidate_view_unittest.cc index 92d14d2..708ec92 100644 --- a/ash/ime/candidate_view_unittest.cc +++ b/ash/ime/candidate_view_unittest.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/events/test/event_generator.h" #include "ui/views/controls/button/button.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/fill_layout.h" @@ -57,7 +57,7 @@ class CandidateViewTest : public views::ViewsTestBase, widget_->Show(); aura::Window* native_window = widget_->GetNativeWindow(); - event_generator_.reset(new ui::test::EventGenerator( + event_generator_.reset(new aura::test::EventGenerator( native_window->GetRootWindow(), native_window)); } @@ -97,7 +97,9 @@ class CandidateViewTest : public views::ViewsTestBase, return -1; } - ui::test::EventGenerator* event_generator() { return event_generator_.get(); } + aura::test::EventGenerator* event_generator() { + return event_generator_.get(); + } private: virtual void ButtonPressed(views::Button* sender, @@ -107,7 +109,7 @@ class CandidateViewTest : public views::ViewsTestBase, views::Widget* widget_; views::View* container_; - scoped_ptr<ui::test::EventGenerator> event_generator_; + scoped_ptr<aura::test::EventGenerator> event_generator_; views::View* last_pressed_; DISALLOW_COPY_AND_ASSIGN(CandidateViewTest); |