summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/window_sizer
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 01:48:52 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 01:48:52 +0000
commit73c9fd0c41a31aab0be7a31e173f3a90f7b588f7 (patch)
tree0becd035d0e5424fc115a5e84d3b86cf218fe648 /chrome/browser/ui/window_sizer
parenteab395117ab90f0a26b2c0335c3619e459973fe6 (diff)
downloadchromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.zip
chromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.tar.gz
chromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.tar.bz2
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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285209 Review URL: https://codereview.chromium.org/406413004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/window_sizer')
-rw-r--r--chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index a688ebf..5e1e389 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -13,9 +13,9 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/test/base/in_process_browser_test.h"
-#include "ui/aura/test/event_generator.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/events/test/event_generator.h"
#include "ui/views/controls/menu/menu_controller.h"
#include "ui/views/view.h"
#include "ui/views/view_model.h"
@@ -54,7 +54,7 @@ gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) {
}
void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {
- aura::test::EventGenerator generator(root_window);
+ ui::test::EventGenerator generator(root_window);
gfx::Point center =
GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
gfx::Display display =