ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/shelf/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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 874 matching lines @@
       shelf_width += translate;
     shelf_width = std::max(shelf_width, kAutoHideSize);
     target_bounds->shelf_bounds_in_root.set_width(shelf_width);
     if (alignment_ == SHELF_ALIGNMENT_RIGHT) {
       target_bounds->shelf_bounds_in_root.set_x(
           available_bounds.right() - shelf_width);
     }
 
     if (ash::switches::UseAlternateShelfLayout()) {
       if (alignment_ == SHELF_ALIGNMENT_RIGHT) {
-        target_bounds->shelf_bounds_in_root.set_x(
+        target_bounds->status_bounds_in_shelf.set_x(kStatusAreaInset);
+      } else {
+        target_bounds->status_bounds_in_shelf.set_x(
             available_bounds.right() - shelf_width + kStatusAreaInset);
-      } else {
-        target_bounds->shelf_bounds_in_root.set_x(kStatusAreaInset);
       }
     } else {
       // The statusbar should be in the center of the shelf.
       gfx::Rect status_x = target_bounds->shelf_bounds_in_root;
       status_x.set_x(0);
       status_x.ClampToCenteredSize(
           target_bounds->status_bounds_in_shelf.size());
       target_bounds->status_bounds_in_shelf.set_x(status_x.x());
     }
   }
@@ skipping 212 matching lines @@
       return gfx::Insets(0, distance, 0, 0);
     case SHELF_ALIGNMENT_TOP:
       return gfx::Insets(0, 0, distance, 0);
   }
   NOTREACHED();
   return gfx::Insets();
 }
 
 }  // namespace internal
 }  // namespace ash