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

ui/app_list/search_result_view.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 "ui/app_list/search_result_view.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/search_result_list_view.h"
 #include "ui/gfx/canvas.h"
@@ skipping 150 matching lines @@
 }
 
 void SearchResultView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect icon_bounds(rect);
   icon_bounds.set_width(kIconViewWidth);
   icon_bounds.Inset(kIconPadding, (rect.height() - kIconDimension) / 2);
-  icon_->SetBoundsRect(icon_bounds.Intersect(rect));
+  icon_bounds.Intersect(rect);
+  icon_->SetBoundsRect(icon_bounds);
 
   size_t num_buttons = action_buttons_.size();
   for (size_t i = 0; i < num_buttons; ++i) {
     views::ImageButton* button = action_buttons_[i];
     gfx::Rect button_bounds(
         rect.right() - kActionButtonRightMargin -
             (num_buttons - i) * kActionButtonWidth,
         (rect.y() + rect.height() - kActionIconDimension) / 2,
         kActionButtonWidth, kActionIconDimension);
     button->SetBoundsRect(button_bounds);
@@ skipping 10 matching lines @@
 
   canvas->FillRect(content_rect, kContentsBackgroundColor);
 
   bool selected = list_view_->IsResultViewSelected(this);
   if (selected) {
     canvas->FillRect(content_rect, kSelectedBackgroundColor);
   } else if (state() == BS_HOT || state() == BS_PUSHED) {
     canvas->FillRect(content_rect, kHoverAndPushedColor);
   }
 
-  gfx::Rect border_bottom = rect.Subtract(content_rect);
+  gfx::Rect border_bottom(rect);
+  border_bottom.Subtract(content_rect);
   canvas->FillRect(border_bottom,
                    selected ? kSelectedBorderColor : kBorderColor);
 
   gfx::Rect text_bounds(rect);
   text_bounds.set_x(kIconViewWidth);
   text_bounds.set_width(
       rect.width() - kIconViewWidth - kTextTrailPadding -
       action_buttons_.size() * kActionButtonWidth -
       (!action_buttons_.empty() ? kActionButtonRightMargin : 0));
   text_bounds.set_x(GetMirroredXWithWidthInView(text_bounds.x(),
@@ skipping 11 matching lines @@
                                           title_size));
     title_text_->Draw(canvas);
 
     y += title_size.height();
     details_text_->SetDisplayRect(gfx::Rect(gfx::Point(text_bounds.x(), y),
                                             details_size));
     details_text_->Draw(canvas);
   } else if (title_text_.get()) {
     gfx::Size title_size(text_bounds.width(),
                          title_text_->GetStringSize().height());
-    title_text_->SetDisplayRect(text_bounds.Center(title_size));
+    gfx::Rect centered_title_rect(text_bounds);
+    centered_title_rect.ClampToCenteredSize(title_size);
+    title_text_->SetDisplayRect(centered_title_rect);
     title_text_->Draw(canvas);
   }
 }
 
 void SearchResultView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   if (sender == this) {
     delegate_->SearchResultActivated(this, event);
     return;
   }
@@ skipping 52 matching lines @@
       views::ImageButton* button = action_buttons_[i];
       button->SetImage(views::CustomButton::BS_NORMAL, &icon.base_image);
       button->SetImage(views::CustomButton::BS_HOT, &icon.hover_image);
       button->SetImage(views::CustomButton::BS_PUSHED, &icon.pressed_image);
       button->SetTooltipText(icon.tooltip_text);
     }
   }
 }
 
 }  // namespace app_list