Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: ui/views/controls/slider_unittest.cc

Issue 322893005: MacViews: Add WidgetEventGenerator to abstract platform-specific event generation for tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self review + related fix for r283070 Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/slider_unittest.cc
diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc
index da6700e0f72ea51cc49189e8fb92f8305ef600e1..a9907be937527691c97f0162b1545e2c7d33b458 100644
--- a/ui/views/controls/slider_unittest.cc
+++ b/ui/views/controls/slider_unittest.cc
@@ -11,13 +11,12 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/events/event.h"
#include "ui/events/gesture_event_details.h"
#include "ui/views/test/slider_test_api.h"
#include "ui/views/test/views_test_base.h"
+#include "ui/views/test/widget_event_generator.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -147,7 +146,7 @@ class SliderTest : public views::ViewsTestBase {
virtual void SetUp() OVERRIDE;
virtual void TearDown() OVERRIDE;
- aura::test::EventGenerator* event_generator() {
+ test::WidgetEventGenerator* event_generator() {
return event_generator_.get();
}
@@ -168,7 +167,7 @@ class SliderTest : public views::ViewsTestBase {
// The widget container for the slider being tested.
views::Widget* widget_;
// An event generator.
- scoped_ptr<aura::test::EventGenerator> event_generator_;
+ scoped_ptr<test::WidgetEventGenerator> event_generator_;
DISALLOW_COPY_AND_ASSIGN(SliderTest);
};
@@ -204,9 +203,7 @@ void SliderTest::SetUp() {
widget_->SetContentsView(slider_);
widget_->Show();
- aura::Window* native_window = widget_->GetNativeWindow();
- event_generator_.reset(new aura::test::EventGenerator(
- native_window->GetRootWindow()));
+ event_generator_.reset(new test::WidgetEventGenerator(widget_));
}
void SliderTest::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698