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 <string> | 7 #include <string> |
8 | 8 |
| 9 #include "base/i18n/rtl.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
14 #include "ui/base/l10n/l10n_util.h" | |
15 #include "ui/events/event.h" | 15 #include "ui/events/event.h" |
16 #include "ui/events/gesture_event_details.h" | 16 #include "ui/events/gesture_event_details.h" |
17 #include "ui/events/test/event_generator.h" | 17 #include "ui/events/test/event_generator.h" |
18 #include "ui/views/test/slider_test_api.h" | 18 #include "ui/views/test/slider_test_api.h" |
19 #include "ui/views/test/views_test_base.h" | 19 #include "ui/views/test/views_test_base.h" |
20 #include "ui/views/view.h" | 20 #include "ui/views/view.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 #include "ui/views/widget/widget_delegate.h" | 22 #include "ui/views/widget/widget_delegate.h" |
23 | 23 |
24 namespace { | 24 namespace { |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 | 185 |
186 void SliderTest::SetUp() { | 186 void SliderTest::SetUp() { |
187 views::ViewsTestBase::SetUp(); | 187 views::ViewsTestBase::SetUp(); |
188 | 188 |
189 slider_ = new Slider(NULL, orientation_); | 189 slider_ = new Slider(NULL, orientation_); |
190 View* view = slider_; | 190 View* view = slider_; |
191 gfx::Size size = view->GetPreferredSize(); | 191 gfx::Size size = view->GetPreferredSize(); |
192 view->SetSize(size); | 192 view->SetSize(size); |
193 max_x_ = size.width() - 1; | 193 max_x_ = size.width() - 1; |
194 max_y_ = size.height() - 1; | 194 max_y_ = size.height() - 1; |
195 default_locale_ = l10n_util::GetApplicationLocale(""); | 195 default_locale_ = base::i18n::GetConfiguredLocale(); |
196 | 196 |
197 views::Widget::InitParams init_params(CreateParams( | 197 views::Widget::InitParams init_params(CreateParams( |
198 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS)); | 198 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS)); |
199 init_params.bounds = gfx::Rect(size); | 199 init_params.bounds = gfx::Rect(size); |
200 | 200 |
201 widget_ = new views::Widget(); | 201 widget_ = new views::Widget(); |
202 widget_->Init(init_params); | 202 widget_->Init(init_params); |
203 widget_->SetContentsView(slider_); | 203 widget_->SetContentsView(slider_); |
204 widget_->Show(); | 204 widget_->Show(); |
205 | 205 |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 EXPECT_EQ(1, slider_listener().last_drag_started_epoch()); | 378 EXPECT_EQ(1, slider_listener().last_drag_started_epoch()); |
379 EXPECT_GT(slider_listener().last_drag_ended_epoch(), | 379 EXPECT_GT(slider_listener().last_drag_ended_epoch(), |
380 slider_listener().last_drag_started_epoch()); | 380 slider_listener().last_drag_started_epoch()); |
381 EXPECT_EQ(slider(), slider_listener().last_drag_started_sender()); | 381 EXPECT_EQ(slider(), slider_listener().last_drag_started_sender()); |
382 EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender()); | 382 EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender()); |
383 } | 383 } |
384 | 384 |
385 #endif // !defined(OS_MACOSX) || defined(USE_AURA) | 385 #endif // !defined(OS_MACOSX) || defined(USE_AURA) |
386 | 386 |
387 } // namespace views | 387 } // namespace views |
OLD | NEW |