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

ash/shelf/shelf.cc

 // 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.
 
 #include "ash/shelf/shelf.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 24 matching lines @@
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
              ShelfDelegate* shelf_delegate,
              ShelfWidget* shelf_widget)
-    : shelf_view_(nullptr),
-      alignment_(SHELF_ALIGNMENT_BOTTOM),
-      auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_NEVER),
-      delegate_(shelf_delegate),
-      shelf_widget_(shelf_widget) {
-  shelf_view_ = new ShelfView(shelf_model, delegate_, this);
+    : delegate_(shelf_delegate),
+      shelf_widget_(shelf_widget),
+      shelf_view_(new ShelfView(shelf_model, delegate_, this)),
+      shelf_locking_manager_(this) {
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
@@ skipping 13 matching lines @@
 
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   shelf_widget_->OnShelfAlignmentChanged();
   delegate_->OnShelfAlignmentChanged(this);
   Shell::GetInstance()->OnShelfAlignmentChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
   // ShelfLayoutManager will resize the shelf.
 }
 
-ShelfAlignment Shelf::GetAlignment() const {
-  // Bottom alignment is forced when the screen is locked or a user gets added.
-  bool locked = shelf_widget_->shelf_layout_manager()->IsAlignmentLocked();
-  return locked ? SHELF_ALIGNMENT_BOTTOM : alignment_;
-}
-
 bool Shelf::IsHorizontalAlignment() const {
-  return alignment_ == SHELF_ALIGNMENT_BOTTOM;
+  return ash::IsHorizontalAlignment(alignment_);
 }
 
 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
   delegate_->OnShelfAutoHideBehaviorChanged(this);
   Shell::GetInstance()->OnShelfAutoHideBehaviorChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
@@ skipping 103 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash