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

Unified Diff: ash/launcher/launcher_view_unittest.cc

Issue 14574009: Use correctly mirrored points for ideal bounds of launcher item icons. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use INSTANTIATE_TEST_CASE_P Created 7 years, 7 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
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index 0470b88e4343ad5b14baeab183391f9a9a70f1e7..3297f04f2adca620dd691984ca6c0047b2a18c91 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -30,7 +30,9 @@
#include "ui/aura/window.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/layer.h"
+#include "ui/views/view_model.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -386,6 +388,50 @@ class LauncherViewTest : public AshTestBase {
DISALLOW_COPY_AND_ASSIGN(LauncherViewTest);
};
+class LauncherViewTextDirectionTest
+ : public LauncherViewTest,
+ public testing::WithParamInterface<bool> {
+ public:
+ LauncherViewTextDirectionTest() : is_rtl_(GetParam()) {}
+ virtual ~LauncherViewTextDirectionTest() {}
+
+ virtual void SetUp() OVERRIDE {
+ LauncherViewTest::SetUp();
+ original_locale_ = l10n_util::GetApplicationLocale(std::string());
+ if (is_rtl_)
+ base::i18n::SetICUDefaultLocale("he");
+ ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
+ }
+
+ virtual void TearDown() OVERRIDE {
+ if (is_rtl_)
+ base::i18n::SetICUDefaultLocale(original_locale_);
+ LauncherViewTest::TearDown();
+ }
+
+ private:
+ bool is_rtl_;
+ std::string original_locale_;
+
+ DISALLOW_COPY_AND_ASSIGN(LauncherViewTextDirectionTest);
+};
+
+// Checks that the ideal item icon bounds match the view's bounds in the screen
+// in both LTR and RTL.
+TEST_P(LauncherViewTextDirectionTest, IdealBoundsOfItemIcon) {
+ LauncherID id = AddTabbedBrowser();
+ internal::LauncherButton* button = GetButtonByID(id);
+ gfx::Rect item_bounds = button->GetBoundsInScreen();
+ gfx::Point icon_offset = button->GetIconBounds().origin();
+ item_bounds.Offset(icon_offset.OffsetFromOrigin());
+ gfx::Rect ideal_bounds = launcher_view_->GetIdealBoundsOfItemIcon(id);
+ gfx::Point screen_origin;
+ views::View::ConvertPointToScreen(launcher_view_, &screen_origin);
+ ideal_bounds.Offset(screen_origin.x(), screen_origin.y());
+ EXPECT_EQ(item_bounds.x(), ideal_bounds.x());
+ EXPECT_EQ(item_bounds.y(), ideal_bounds.y());
+}
+
// Adds browser button until overflow and verifies that the last added browser
// button is hidden.
TEST_F(LauncherViewTest, AddBrowserUntilOverflow) {
@@ -921,5 +967,7 @@ TEST_F(LauncherViewTest, CheckFittsLaw) {
EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
}
+INSTANTIATE_TEST_CASE_P(LtrRtl, LauncherViewTextDirectionTest, testing::Bool());
+
} // namespace test
} // namespace ash
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698