Clean up RTL methods....

views/controls/button/text_button.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/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 325 matching lines @@
   if (text_width > 0) {
     // Because the text button can (at times) draw multiple elements on the
     // canvas, we can not mirror the button by simply flipping the canvas as
     // doing this will mirror the text itself. Flipping the canvas will also
     // make the icons look wrong because icons are almost always represented as
     // direction insentisive bitmaps and such bitmaps should never be flipped
     // horizontally.
     //
     // Due to the above, we must perform the flipping manually for RTL UIs.
     gfx::Rect text_bounds(text_x, text_y, text_width, text_size_.height());
-    text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
+    text_bounds.set_x(GetMirroredXForRect(text_bounds));
 
     SkColor text_color = (show_multiple_icon_states_ &&
         (state() == BS_HOT || state() == BS_PUSHED)) ? color_hover_ : color_;
 
     int draw_string_flags = gfx::CanvasSkia::DefaultCanvasTextAlignment() |
         PrefixTypeToCanvasType(prefix_type_);
 
     if (for_drag) {
 #if defined(OS_WIN)
       // TODO(erg): Either port DrawStringWithHalo to linux or find an
@@ skipping 27 matching lines @@
                             text_bounds.height(),
                             draw_string_flags);
     }
   }
 
   if (icon.width() > 0) {
     int icon_y = (available_height - icon.height()) / 2 + insets.top();
 
     // Mirroring the icon position if necessary.
     gfx::Rect icon_bounds(icon_x, icon_y, 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());
   }
 }
 
 void TextButton::UpdateColor() {
   color_ = IsEnabled() ? color_enabled_ : color_disabled_;
 }
 
 void TextButton::UpdateTextSize() {
   int width = 0, height = 0;
@@ skipping 50 matching lines @@
 
 std::string TextButton::GetClassName() const {
   return kViewClassName;
 }
 
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views