ash: Move alignment and autohide behavior from Shelf to WmShelf

ash/common/shelf/wm_shelf.cc

 // Copyright 2016 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/common/shelf/shelf.h"
+#include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_lookup.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "base/logging.h"
 
 namespace ash {
 
 void WmShelf::SetShelf(Shelf* shelf) {
   DCHECK(!shelf_);
   DCHECK(shelf);
   shelf_ = shelf;
+  shelf_locking_manager_.reset(new ShelfLockingManager(this));

[msw, 2016/08/24 00:18:59]

Should this DCHECK that the ShelfLayoutManager is valid, since calls to
SetAlignment rely on a valid layout manager and widget?

[James Cook, 2016/08/24 04:19:08]

Good idea. Done.

+  // When the shelf is created the alignment is unlocked. Chrome will update the
+  // alignment later from preferences.
+  alignment_ = SHELF_ALIGNMENT_BOTTOM;
 }
 
 void WmShelf::ClearShelf() {
   DCHECK(shelf_);
+  shelf_locking_manager_.reset();
   shelf_ = nullptr;
 }
 
 void WmShelf::SetShelfLayoutManager(ShelfLayoutManager* manager) {
   DCHECK(!shelf_layout_manager_);
   DCHECK(manager);
   shelf_layout_manager_ = manager;
   shelf_layout_manager_->AddObserver(this);
 }
 
 WmWindow* WmShelf::GetWindow() {
   // Use |shelf_layout_manager_| to access ShelfWidget because it is set before
   // before the Shelf instance is available.
   return WmLookup::Get()->GetWindowForWidget(
       shelf_layout_manager_->shelf_widget());
 }
 
-ShelfAlignment WmShelf::GetAlignment() const {
-  return shelf_ ? shelf_->alignment() : SHELF_ALIGNMENT_BOTTOM_LOCKED;
-}
+void WmShelf::SetAlignment(ShelfAlignment alignment) {
+  if (alignment_ == alignment)
+    return;
 
-void WmShelf::SetAlignment(ShelfAlignment alignment) {
-  shelf_->SetAlignment(alignment);
+  if (shelf_locking_manager_->is_locked() &&
+      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+    shelf_locking_manager_->set_stored_alignment(alignment);
+    return;
+  }
+
+  alignment_ = alignment;
+  // The ShelfWidget notifies the ShelfView of the alignment change.
+  shelf_layout_manager_->shelf_widget()->OnShelfAlignmentChanged();
+  WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(shelf_);
+  WmShell::Get()->NotifyShelfAlignmentChanged(GetWindow()->GetRootWindow());
+  // ShelfLayoutManager will resize the shelf.
 }
 
 bool WmShelf::IsHorizontalAlignment() const {
-  switch (GetAlignment()) {
+  switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return true;
     case SHELF_ALIGNMENT_LEFT:
     case SHELF_ALIGNMENT_RIGHT:
       return false;
   }
   NOTREACHED();
   return true;
 }
 
 int WmShelf::SelectValueForShelfAlignment(int bottom,
                                           int left,
                                           int right) const {
-  switch (GetAlignment()) {
+  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 bottom;
 }
 
 int WmShelf::PrimaryAxisValue(int horizontal, int vertical) const {
   return IsHorizontalAlignment() ? horizontal : vertical;
 }
 
-ShelfAutoHideBehavior WmShelf::GetAutoHideBehavior() const {
-  return shelf_->auto_hide_behavior();
-}
+void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
+  if (auto_hide_behavior_ == auto_hide_behavior)
+    return;
 
-void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
-  shelf_->SetAutoHideBehavior(behavior);
+  auto_hide_behavior_ = auto_hide_behavior;
+  WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(shelf_);
+  WmShell::Get()->NotifyShelfAutoHideBehaviorChanged(
+      GetWindow()->GetRootWindow());
 }
 
 ShelfAutoHideState WmShelf::GetAutoHideState() const {
   return shelf_layout_manager_->auto_hide_state();
 }
 
 void WmShelf::UpdateAutoHideState() {
   shelf_layout_manager_->UpdateAutoHideState();
 }
 
@@ skipping 61 matching lines @@
 
 StatusAreaWidget* WmShelf::GetStatusAreaWidget() const {
   return shelf_layout_manager_->shelf_widget()->status_area_widget();
 }
 
 void WmShelf::SetVirtualKeyboardBoundsForTesting(const gfx::Rect& bounds) {
   shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
 }
 
 ShelfLockingManager* WmShelf::GetShelfLockingManagerForTesting() {
-  return shelf_->shelf_locking_manager_for_testing();
+  return shelf_locking_manager_.get();
 }
 
 ShelfView* WmShelf::GetShelfViewForTesting() {
   return shelf_->shelf_view_for_testing();
 }
 
+ShelfWidget* WmShelf::GetShelfWidgetForTesting() {
+  return shelf_layout_manager_->shelf_widget();
+}
+
 WmShelf::WmShelf() {}
 
 WmShelf::~WmShelf() {}
 
 void WmShelf::WillDeleteShelfLayoutManager() {
   DCHECK(shelf_layout_manager_);
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 void WmShelf::WillChangeVisibilityState(ShelfVisibilityState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     WillChangeVisibilityState(new_state));
 }
 
 void WmShelf::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnAutoHideStateChanged(new_state));
 }
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   BackgroundAnimatorChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundTypeChanged(background_type, change_type));
 }
 
 }  // namespace ash