summaryrefslogtreecommitdiffstats
path: root/ash/first_run
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 13:18:41 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 13:18:41 +0000
commitdd131d3723dee3050b746319e437514d8fdb6bb1 (patch)
treec44435187d6d4df51dcf5e02b31be151de270390 /ash/first_run
parent2c6e3b04ca361d052f1e8fdc70983bcc7c379dba (diff)
downloadchromium_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/first_run')
-rw-r--r--ash/first_run/first_run_helper_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/first_run/first_run_helper_unittest.cc b/ash/first_run/first_run_helper_unittest.cc
index df272aa..15e42bf 100644
--- a/ash/first_run/first_run_helper_unittest.cc
+++ b/ash/first_run/first_run_helper_unittest.cc
@@ -8,8 +8,8 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
+#include "ui/aura/test/event_generator.h"
#include "ui/events/event_handler.h"
-#include "ui/events/test/event_generator.h"
#include "ui/views/widget/widget.h"
#include "ui/views/window/dialog_delegate.h"