| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/slider.h" | 5 #include "ui/views/controls/slider.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 | 198 |
| 199 views::Widget::InitParams init_params(CreateParams( | 199 views::Widget::InitParams init_params(CreateParams( |
| 200 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS)); | 200 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS)); |
| 201 init_params.bounds = gfx::Rect(size); | 201 init_params.bounds = gfx::Rect(size); |
| 202 | 202 |
| 203 widget_ = new views::Widget(); | 203 widget_ = new views::Widget(); |
| 204 widget_->Init(init_params); | 204 widget_->Init(init_params); |
| 205 widget_->SetContentsView(slider_); | 205 widget_->SetContentsView(slider_); |
| 206 widget_->Show(); | 206 widget_->Show(); |
| 207 | 207 |
| 208 event_generator_.reset(new ui::test::EventGenerator( | 208 event_generator_.reset( |
| 209 GetContext(), widget_->GetNativeWindow())); | 209 new ui::test::EventGenerator(widget_->GetNativeWindow())); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void SliderTest::TearDown() { | 212 void SliderTest::TearDown() { |
| 213 if (widget_ && !widget_->IsClosed()) | 213 if (widget_ && !widget_->IsClosed()) |
| 214 widget_->Close(); | 214 widget_->Close(); |
| 215 | 215 |
| 216 base::i18n::SetICUDefaultLocale(default_locale_); | 216 base::i18n::SetICUDefaultLocale(default_locale_); |
| 217 | 217 |
| 218 views::ViewsTestBase::TearDown(); | 218 views::ViewsTestBase::TearDown(); |
| 219 } | 219 } |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 EXPECT_EQ(1, slider_listener().last_drag_started_epoch()); | 380 EXPECT_EQ(1, slider_listener().last_drag_started_epoch()); |
| 381 EXPECT_GT(slider_listener().last_drag_ended_epoch(), | 381 EXPECT_GT(slider_listener().last_drag_ended_epoch(), |
| 382 slider_listener().last_drag_started_epoch()); | 382 slider_listener().last_drag_started_epoch()); |
| 383 EXPECT_EQ(slider(), slider_listener().last_drag_started_sender()); | 383 EXPECT_EQ(slider(), slider_listener().last_drag_started_sender()); |
| 384 EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender()); | 384 EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender()); |
| 385 } | 385 } |
| 386 | 386 |
| 387 #endif // !defined(OS_MACOSX) || defined(USE_AURA) | 387 #endif // !defined(OS_MACOSX) || defined(USE_AURA) |
| 388 | 388 |
| 389 } // namespace views | 389 } // namespace views |
| OLD | NEW |