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

chrome/browser/ui/views/notifications/balloon_view_views.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 "chrome/browser/ui/views/notifications/balloon_view_views.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 242 matching lines @@
   if (view)
     view->SetSize(contents_rect.size());
 }
 
 gfx::Rect BalloonViewImpl::GetCloseButtonBounds() const {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(GetShelfHeight());
   const gfx::Size& pref_size(close_button_->GetPreferredSize());
   bounds.Inset(bounds.width() - kShelfMargin - pref_size.width(), 0,
       kShelfMargin, 0);
-  return bounds.Center(pref_size);
+  bounds.ClampToCenteredSize(pref_size);
+  return bounds;
 }
 
 gfx::Rect BalloonViewImpl::GetOptionsButtonBounds() const {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(GetShelfHeight());
   const gfx::Size& pref_size(options_menu_button_->GetPreferredSize());
   bounds.set_x(GetCloseButtonBounds().x() - kOptionsDismissSpacing -
       pref_size.width());
   bounds.set_width(pref_size.width());
-  return bounds.Center(pref_size);
+  bounds.ClampToCenteredSize(pref_size);
+  return bounds;
 }
 
 gfx::Rect BalloonViewImpl::GetLabelBounds() const {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(GetShelfHeight());
   gfx::Size pref_size(source_label_->GetPreferredSize());
   bounds.Inset(kLabelLeftMargin, 0, bounds.width() -
       GetOptionsButtonBounds().x() + kLabelOptionsSpacing, 0);
   pref_size.set_width(bounds.width());
-  return bounds.Center(pref_size);
+  bounds.ClampToCenteredSize(pref_size);
+  return bounds;
 }
 
 void BalloonViewImpl::Show(Balloon* balloon) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   balloon_ = balloon;
 
   const string16 source_label_text = l10n_util::GetStringFUTF16(
       IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,
       balloon->notification().display_source());
@@ skipping 232 matching lines @@
     return;
   }
 
   // If the renderer process attached to this balloon is disconnected
   // (e.g., because of a crash), we want to close the balloon.
   notification_registrar_.Remove(
       this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
       content::Source<Balloon>(balloon_));
   Close(false);
 }