Use correctly mirrored points for ideal bounds of launcher item icons.

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher.h"
@@ skipping 13 matching lines @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.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"
 
 namespace {
 const int kExpectedAppIndex = 1;
 }
 
 namespace ash {
 namespace test {
 
@@ skipping 326 matching lines @@
 
   LauncherModel* model_;
   internal::LauncherView* launcher_view_;
 
   scoped_ptr<LauncherViewTestAPI> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LauncherViewTest);
 };
 
+class LauncherViewRTLTest : public LauncherViewTest {
+ public:
+  LauncherViewRTLTest() {}
+  virtual ~LauncherViewRTLTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    base::i18n::SetICUDefaultLocale("ar");
+    LauncherViewTest::SetUp();
+    ASSERT_TRUE(base::i18n::IsRTL());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(LauncherViewRTLTest);
+};
+
+// Checks that the ideal item icon bounds match the view's bounds in the screen.
+TEST_F(LauncherViewTest, IdealBoundsOfItemIcon) {
+  LauncherID id = AddTabbedBrowser();
+  internal::LauncherButton* button = GetButtonByID(id);
+  gfx::Rect item_bounds = button->GetBoundsInScreen();
+  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());
+}
+
+// Checks that the ideal item icon bounds are correct in RTL.
+TEST_F(LauncherViewRTLTest, IdealBoundsOfItemIcon) {
+  LauncherID id = AddTabbedBrowser();
+  internal::LauncherButton* button = GetButtonByID(id);
+  gfx::Rect item_bounds = button->GetBoundsInScreen();
+  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());
+}
+
 // Checks that the icon positions do not shift with a state change.
 TEST_F(LauncherViewTest, NoStateChangeIconMovement) {
   LauncherID last_added = AddAppShortcut();
   internal::LauncherButton* button = GetButtonByID(last_added);
   EXPECT_EQ(button->state(), ash::internal::LauncherButton::STATE_NORMAL);
   gfx::Rect old_bounds = button->GetIconBounds();
 
   button->AddState(ash::internal::LauncherButton::STATE_HOVERED);
   gfx::Rect hovered_bounds = button->GetIconBounds();
   EXPECT_EQ(old_bounds.ToString(), hovered_bounds.ToString());
@@ skipping 516 matching lines @@
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
   gfx::Rect ideal_bounds_0 = test_api_->GetIdealBoundsByIndex(0);
   gfx::Rect ideal_bounds_1 = test_api_->GetIdealBoundsByIndex(1);
   EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
 }
 
 }  // namespace test
 }  // namespace ash