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

ash/wm/shelf_layout_manager.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/wm/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/ash_switches.h"
@@ skipping 728 matching lines @@
       // When dragging down, the statusbar should move.
       target_bounds->status_bounds_in_root.Offset(0, translate);
     } else {
       // When dragging up, the launcher height should increase.
       float move = std::max(translate,
                             -static_cast<float>(resistance_free_region));
       target_bounds->launcher_bounds_in_root.set_height(
           target_bounds->launcher_bounds_in_root.height() + move - translate);
 
       // The statusbar should be in the center.
-      gfx::Rect status_y = target_bounds->launcher_bounds_in_root.Center(
+      gfx::Rect status_y = target_bounds->launcher_bounds_in_root;
+      status_y.ClampToCenteredSize(
           target_bounds->status_bounds_in_root.size());
       target_bounds->status_bounds_in_root.set_y(status_y.y());
     }
   } else {
     // Move the launcher with the gesture.
     if (alignment() == SHELF_ALIGNMENT_RIGHT)
       target_bounds->launcher_bounds_in_root.Offset(translate, 0);
 
     if ((translate > 0 && alignment() == SHELF_ALIGNMENT_RIGHT) ||
         (translate < 0 && alignment() == SHELF_ALIGNMENT_LEFT)) {
       // When dragging towards the edge, the statusbar should move.
       target_bounds->status_bounds_in_root.Offset(translate, 0);
     } else {
       // When dragging away from the edge, the launcher width should increase.
       float move = alignment() == SHELF_ALIGNMENT_RIGHT ?
           std::max(translate, -static_cast<float>(resistance_free_region)) :
           std::min(translate, static_cast<float>(resistance_free_region));
 
       if (alignment() == SHELF_ALIGNMENT_RIGHT) {
         target_bounds->launcher_bounds_in_root.set_width(
             target_bounds->launcher_bounds_in_root.width() + move - translate);
       } else {
         target_bounds->launcher_bounds_in_root.set_width(
             target_bounds->launcher_bounds_in_root.width() - move + translate);
       }
 
       // The statusbar should be in the center.
-      gfx::Rect status_x = target_bounds->launcher_bounds_in_root.Center(
+      gfx::Rect status_x = target_bounds->launcher_bounds_in_root;
+      status_x.ClampToCenteredSize(
           target_bounds->status_bounds_in_root.size());
       target_bounds->status_bounds_in_root.set_x(status_x.x());
     }
   }
 }
 
 void ShelfLayoutManager::UpdateShelfBackground(
     BackgroundAnimator::ChangeType type) {
   bool launcher_paints = GetLauncherPaintsBackground();
   if (launcher_)
@@ skipping 101 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash