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

ash/launcher/launcher_view.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 "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 421 matching lines @@
 gfx::Rect LauncherView::GetIdealBoundsOfItemIcon(LauncherID id) {
   int index = model_->ItemIndexByID(id);
   if (index == -1 || (index > last_visible_index_ &&
                       index < model_->FirstPanelIndex()))
     return gfx::Rect();
   const gfx::Rect& ideal_bounds(view_model_->ideal_bounds(index));
   DCHECK_NE(TYPE_APP_LIST, model_->items()[index].type);
   LauncherButton* button =
       static_cast<LauncherButton*>(view_model_->view_at(index));
   gfx::Rect icon_bounds = button->GetIconBounds();
-  return gfx::Rect(ideal_bounds.x() + icon_bounds.x(),
-                   ideal_bounds.y() + icon_bounds.y(),
+  return gfx::Rect(GetMirroredXWithWidthInView(ideal_bounds.x(),
+                                               icon_bounds.width()),
+                   ideal_bounds.y(),
                    icon_bounds.width(),
                    icon_bounds.height());
 }
 
 void LauncherView::UpdatePanelIconPosition(LauncherID id,
                                            const gfx::Point& midpoint) {
   int current_index = model_->ItemIndexByID(id);
   int first_panel_index = model_->FirstPanelIndex();
   if (current_index < first_panel_index)
     return;
 
+  gfx::Point midpoint_in_view(GetMirroredXInView(midpoint.x()),
+                              midpoint.y());
   ShelfLayoutManager* shelf = tooltip_->shelf_layout_manager();
   int target_index = current_index;
   while (target_index > first_panel_index &&
          shelf->PrimaryAxisValue(view_model_->ideal_bounds(target_index).x(),
                                  view_model_->ideal_bounds(target_index).y()) >
-         shelf->PrimaryAxisValue(midpoint.x(), midpoint.y())) {
+         shelf->PrimaryAxisValue(midpoint_in_view.x(), midpoint_in_view.y())) {
     --target_index;
   }
   while (target_index < view_model_->view_size() - 1 &&
          shelf->PrimaryAxisValue(
              view_model_->ideal_bounds(target_index).right(),
              view_model_->ideal_bounds(target_index).bottom()) <
-         shelf->PrimaryAxisValue(midpoint.x(), midpoint.y())) {
+         shelf->PrimaryAxisValue(midpoint_in_view.x(), midpoint_in_view.y())) {
     ++target_index;
   }
   if (current_index != target_index)
     model_->Move(current_index, target_index);
 }
 
 bool LauncherView::IsShowingMenu() const {
 #if !defined(OS_MACOSX)
   return (launcher_menu_runner_.get() &&
        launcher_menu_runner_->IsRunning());
@@ skipping 1017 matching lines @@
 bool LauncherView::ShouldShowTooltipForView(const views::View* view) const {
   if (view == GetAppListButtonView() &&
       Shell::GetInstance()->GetAppListWindow())
     return false;
   const LauncherItem* item = LauncherItemForView(view);
   return (!item || delegate_->ShouldShowTooltip(*item));
 }
 
 }  // namespace internal
 }  // namespace ash