[User Menu] Flipped the profile badge to be on the LHS for RTL layouts

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
+#include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
@@ skipping 349 matching lines @@
     SetBorder(views::Border::NullBorder());
     if (switches::IsMaterialDesignUserMenu()) {
       SetMinSize(gfx::Size(GetPreferredSize().width() + badge_spacing(),
                            GetPreferredSize().height() + badge_spacing() +
                                views::kRelatedControlSmallVerticalSpacing));
     } else {
       SetSize(GetPreferredSize());
     }
 
     // Calculate the circular mask that will be used to display the photo.
+    // For RTL layouts, right-align the circular mask because profile badge can
+    // appear on the LHS.
     circular_mask_.addCircle(
-        SkIntToScalar(icon_image_side() / 2),
+        SkIntToScalar(icon_image_side() / 2) +
+            (base::i18n::IsRTL() ? badge_spacing() : 0),

[sky, 2016/08/26 19:18:27]

In general we use the various GetMirrored* functions in View to adjust for rtl.
That you're doing something special here typically indicates something may be
wrong. AFAICT circular_mask_ is intended to be around the image drawn by
LabelButton. If that's right, why do you need circular_mask_? Can't you
calculate it when needed directly from the bounds of image()? I'm specifically
suggesting something like this:

void PaintChildren() {
  ...
  gfx::Rect clip_bounds = image()->GetMirroredBounds();
  gfx::Path clip_mask;
  clip_mask.AddCircle(use clip_bounds to calculate circle, shouldn't need to
adjust for rtl as GetMirroredBounds() does that for you);
  ...
?
}

In looking at this code a bit more, I'm also unclear as to why the path is
clipped in both OnPaint and PaintChildren? Don't you only care about
PaintChildren?

         SkIntToScalar(icon_image_side() / 2) + badge_spacing(),
         SkIntToScalar(icon_image_side() / 2));
 
     if (switches::IsMaterialDesignUserMenu() || !is_editing_allowed) {
       SetEnabled(false);
       return;
     }
 
     set_notify_enter_exit_on_child(true);
 
@@ skipping 33 matching lines @@
     gfx::Canvas* canvas = paint_recorder.canvas();
     if (profile_->IsSupervised()) {
       gfx::Rect bounds(0, 0, GetProfileBadgeSize(), GetProfileBadgeSize());
       int badge_offset =
           icon_image_side() + badge_spacing() - GetProfileBadgeSize();
       gfx::Vector2d badge_offset_vector = gfx::Vector2d(
           badge_offset,
           badge_offset + (switches::IsMaterialDesignUserMenu()
                               ? views::kRelatedControlSmallVerticalSpacing
                               : 0));
+      // For RTL layouts, left-align the profile badge.

[sky, 2016/08/26 19:18:27]

Similar comment here. Generally you calculate the value in ltr, and then
somewhere along the line use one of the GetMirrored* functions.

+      if (base::i18n::IsRTL())
+        badge_offset_vector.set_x(0);
       gfx::Point center_point = bounds.CenterPoint() + badge_offset_vector;
 
       // Paint the circular background.
       SkPaint paint;
       paint.setAntiAlias(true);
       paint.setColor(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_BubbleBackground));
       canvas->DrawCircle(center_point, GetProfileBadgeSize() / 2, paint);
 
       gfx::VectorIconId icon_id;
@@ skipping 1863 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }