(Merge to M-51) Revise the shelf alignment locking mechanism.

ash/shelf/shelf.h

 // Copyright 2013 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.
 
 #ifndef ASH_SHELF_SHELF_H_
 #define ASH_SHELF_SHELF_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_constants.h"
+#include "ash/shelf/shelf_locking_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
@@ skipping 29 matching lines @@
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
   static Shelf* ForPrimaryDisplay();
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
   static Shelf* ForWindow(const aura::Window* window);
 
   void SetAlignment(ShelfAlignment alignment);
-  ShelfAlignment GetAlignment() const;
+  ShelfAlignment alignment() const { return alignment_; }
   bool IsHorizontalAlignment() const;
 
-  // TODO(msw): Remove this accessor, kept temporarily to simplify changes.
-  ShelfAlignment alignment() const { return GetAlignment(); }
-
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
   // TODO(msw): Remove this accessor, kept temporarily to simplify changes.
   ShelfAutoHideBehavior GetAutoHideBehavior() const;
 
   // A helper functions that chooses values specific to a shelf alignment.
   template <typename T>
   T SelectValueForShelfAlignment(T bottom, T left, T right) const {
     switch (alignment_) {
       case SHELF_ALIGNMENT_BOTTOM:
+      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
         return bottom;
       case SHELF_ALIGNMENT_LEFT:
         return left;
       case SHELF_ALIGNMENT_RIGHT:
         return right;
     }
     NOTREACHED();
     return right;
   }
 
@@ skipping 47 matching lines @@
   // Returns rectangle bounding all visible shelf items. Used screen coordinate
   // system.
   gfx::Rect GetVisibleItemsBoundsInScreen() const;
 
   // Returns ApplicationDragAndDropHost for this shelf.
   app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
 
  private:
   friend class test::ShelfTestAPI;
 
-  // ShelfView used to display icons.
+  ShelfDelegate* delegate_;
+  ShelfWidget* shelf_widget_;
   ShelfView* shelf_view_;
+  ShelfLockingManager shelf_locking_manager_;
 
-  ShelfAlignment alignment_;
-  ShelfAutoHideBehavior auto_hide_behavior_;
-
-  ShelfDelegate* delegate_;
-
-  ShelfWidget* shelf_widget_;
+  ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
+  ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_