Clean up RTL methods....

views/controls/menu/menu_item_view_win.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 <uxtheme.h>
 #include <Vssym32.h>
 
 #include "grit/app_strings.h"
@@ skipping 70 matching lines @@
   // get color.
   int default_sys_color = render_selection ? COLOR_HIGHLIGHTTEXT :
       (IsEnabled() ? COLOR_MENUTEXT : COLOR_GRAYTEXT);
   SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault(
       NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
   const gfx::Font& font = MenuConfig::instance().font;
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
   int width = this->width() - item_right_margin_ - label_start_ - accel_width;
   gfx::Rect text_bounds(label_start_, top_margin, width, font.GetHeight());
-  text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
+  text_bounds.set_x(GetMirroredXForRect(text_bounds));
   if (for_drag) {
     // With different themes, it's difficult to tell what the correct
     // foreground and background colors are for the text to draw the correct
     // halo. Instead, just draw black on white, which will look good in most
     // cases.
     canvas->AsCanvasSkia()->DrawStringWithHalo(
         GetTitle(), font, 0x00000000, 0xFFFFFFFF, text_bounds.x(),
         text_bounds.y(), text_bounds.width(), text_bounds.height(),
         GetRootMenuItem()->GetDrawStringFlags());
   } else {
     canvas->DrawStringInt(GetTitle(), font, fg_color,
                           text_bounds.x(), text_bounds.y(), text_bounds.width(),
                           text_bounds.height(),
                           GetRootMenuItem()->GetDrawStringFlags());
   }
 
   PaintAccelerator(canvas);
 
   if (icon_.width() > 0) {
     gfx::Rect icon_bounds(config.item_left_margin,
                           top_margin + (height() - top_margin -
                           bottom_margin - icon_.height()) / 2,
                           icon_.width(),
                           icon_.height());
-    icon_bounds.set_x(MirroredLeftPointForRect(icon_bounds));
+    icon_bounds.set_x(GetMirroredXForRect(icon_bounds));
     canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y());
   }
 
   if (HasSubmenu()) {
     int state_id = IsEnabled() ? MSM_NORMAL : MSM_DISABLED;
     gfx::Rect arrow_bounds(this->width() - item_right_margin_ +
                            config.label_to_arrow_padding, 0,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
 
@@ skipping 35 matching lines @@
   // And the check.
   gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
   AdjustBoundsForRTLUI(&icon_bounds);
   RECT icon_rect = icon_bounds.ToRECT();
   NativeTheme::instance()->PaintMenuCheck(
       NativeTheme::MENU, dc, MENU_POPUPCHECK, state_id, &icon_rect,
       control_state);
 }
 
 }  // namespace views