Make gfx::Rect class operations consistently mutate the class they are called on.

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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/system/user/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
@@ skipping 58 matching lines @@
 
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(image_size_.width() + GetInsets().width(),
                      image_size_.height() + GetInsets().height());
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     View::OnPaint(canvas);
     gfx::Rect image_bounds(GetPreferredSize());
-    image_bounds = gfx::Rect(size()).Center(image_bounds.size());
+    image_bounds = gfx::Rect(size());
+    image_bounds.ClampToCenteredSize(image_bounds.size());
     image_bounds.Inset(GetInsets());
     const SkScalar kRadius = SkIntToScalar(corner_radius_);
     SkPath path;
     path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius, kRadius);
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
     canvas->DrawImageInPath(resized_, image_bounds.x(), image_bounds.y(),
                             path, paint);
   }
 
@@ skipping 123 matching lines @@
   }
 
   virtual void Layout() OVERRIDE {
     views::View::Layout();
     if (bounds().IsEmpty())
       return;
 
     container_->SetBoundsRect(gfx::Rect(size()));
     if (signout_ && user_info_) {
       gfx::Rect signout_bounds(signout_->GetPreferredSize());
-      signout_bounds = bounds().Center(signout_bounds.size());
+      signout_bounds = bounds();
+      signout_bounds.ClampToCenteredSize(signout_bounds.size());
       signout_bounds.set_x(width() - signout_bounds.width() -
           kTrayPopupPaddingHorizontal);
       signout_->SetBoundsRect(signout_bounds);
 
       gfx::Rect usercard_bounds(user_info_->GetPreferredSize());
       usercard_bounds.set_width(signout_bounds.x());
       user_info_->SetBoundsRect(usercard_bounds);
     } else if (signout_) {
       signout_->SetBoundsRect(gfx::Rect(size()));
     } else if (user_info_) {
@@ skipping 109 matching lines @@
   // Check for null to avoid crbug.com/150944.
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash