Use ScopedRTLFlipCanvas more pervasively for RTL flipping.

ash/common/system/tray/tray_popup_label_button_border.cc

 // Copyright 2013 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/common/system/tray/tray_popup_label_button_border.h"
 
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/vector2d.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/native_theme_delegate.h"
 
 namespace ash {
 
 TrayPopupLabelButtonBorder::TrayPopupLabelButtonBorder()
     : LabelButtonAssetBorder(views::Button::STYLE_TEXTBUTTON) {
   const int kTrayPopupLabelButtonBorderImagesNormal[] = {
       IDR_AURA_TRAY_POPUP_LABEL_BUTTON_BORDER,
@@ skipping 57 matching lines @@
     for (int i = 0; i < view.parent()->child_count(); ++i) {
       const views::View* child = view.parent()->child_at(i);
       if (child->visible()) {
         first_visible_child = child;
         break;
       }
     }
     if (first_visible_child == &view)
       return;
   }
-  if (base::i18n::IsRTL()) {
-    canvas->Save();
-    canvas->Translate(gfx::Vector2d(view.width(), 0));
-    canvas->Scale(-1, 1);
-    LabelButtonAssetBorder::Paint(view, canvas);
-    canvas->Restore();
-  } else {
-    LabelButtonAssetBorder::Paint(view, canvas);
-  }
+  gfx::ScopedRTLFlipCanvas scoped_canvas(canvas, view.width());
+  LabelButtonAssetBorder::Paint(view, canvas);
 }
 
 }  // namespace ash