Fixes regression in showing bookmark menus where the wrong menu would...

Fixes regression in showing bookmark menus where the wrong menu would
appear when rtl.

BUG=26376
TEST=see bug


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31624

[sky, 2009-11-10 22:48:52]

Reviewers: idana,

Description:
Fixes regression in showing bookmark menus where the wrong menu would
appear when rtl.

BUG=26376
TEST=see bug


Please review this at http://codereview.chromium.org/384021

SVN Base: svn://chrome-svn/chrome/trunk/src/

Affected files:
   M     chrome/browser/views/bookmark_bar_view.cc
   M     views/view.h


Index: views/view.h
===================================================================
--- views/view.h	(revision 31560)
+++ views/view.h	(working copy)
@@ -144,7 +144,7 @@

    // Return the bounds of the View, relative to the parent. If
    // |settings| is IGNORE_MIRRORING_TRANSFORMATION, the function returns  
the
-  // bounds_ rectangle. If |settings| is APPLY_MIRRORING_SETTINGS AND the
+  // bounds_ rectangle. If |settings| is APPLY_MIRRORING_TRANSFORMATION  
AND the
    // parent View is using a right-to-left UI layout, then the function  
returns
    // a shifted version of the bounds_ rectangle that represents the  
mirrored
    // View bounds.
Index: chrome/browser/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/views/bookmark_bar_view.cc	(revision 31560)
+++ chrome/browser/views/bookmark_bar_view.cc	(working copy)
@@ -800,24 +800,26 @@
    if (loc.x() < 0 || loc.x() >= width() || loc.y() < 0 || loc.y() >=  
height())
      return NULL;

+  gfx::Point adjusted_loc(MirroredXCoordinateInsideView(loc.x()), loc.y());
+
    // Check the buttons first.
    for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
      views::View* child = GetChildViewAt(i);
      if (!child->IsVisible())
        break;
-    if (child->bounds().Contains(loc))
+    if (child->bounds().Contains(adjusted_loc))
        return model_->GetBookmarkBarNode()->GetChild(i);
    }

    // Then the overflow button.
    if (overflow_button_->IsVisible() &&
-      overflow_button_->bounds().Contains(loc)) {
+      overflow_button_->bounds().Contains(adjusted_loc)) {
      *start_index = GetFirstHiddenNodeIndex();
      return model_->GetBookmarkBarNode();
    }

    // And finally the other folder.
-  if (other_bookmarked_button_->bounds().Contains(loc))
+  if (other_bookmarked_button_->bounds().Contains(adjusted_loc))
      return model_->other_node();

    return NULL;

[idana, 2009-11-10 23:14:56]

LGTM

Thanks a lot for fixing this, Scott.