Clean up RTL methods....

views/controls/menu/menu_item_view.cc

 // Copyright (c) 2010 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 "views/controls/menu/menu_item_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
@@ skipping 592 matching lines @@
       MenuItemView* menu_item = static_cast<MenuItemView*>(child);
       if (menu_item->HasSubmenu())
         menu_item->RemoveEmptyMenus();
     } else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
       submenu_->RemoveChildView(child);
     }
   }
 }
 
 void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
-  rect->set_x(MirroredLeftPointForRect(*rect));
+  rect->set_x(GetMirroredXForRect(*rect));
 }
 
 void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
   string16 accel_text = GetAcceleratorText();
   if (accel_text.empty())
     return;
 
   const gfx::Font& font = MenuConfig::instance().font;
   int available_height = height() - GetTopMargin() - GetBottomMargin();
   int max_accel_width =
       parent_menu_item_->GetSubmenu()->max_accelerator_width();
   gfx::Rect accel_bounds(width() - item_right_margin_ - max_accel_width,
                          GetTopMargin(), max_accel_width, available_height);
-  accel_bounds.set_x(MirroredLeftPointForRect(accel_bounds));
+  accel_bounds.set_x(GetMirroredXForRect(accel_bounds));
   int flags = GetRootMenuItem()->GetDrawStringFlags() |
       gfx::Canvas::TEXT_VALIGN_MIDDLE;
   flags &= ~(gfx::Canvas::TEXT_ALIGN_RIGHT | gfx::Canvas::TEXT_ALIGN_LEFT);
   if (base::i18n::IsRTL())
     flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
   else
     flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
   canvas->DrawStringInt(
       accel_text, font, TextButton::kDisabledColor,
       accel_bounds.x(), accel_bounds.y(), accel_bounds.width(),
@@ skipping 40 matching lines @@
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views