Use mojo Shelf interfaces for both mash and classic ash.

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/wm_shelf.h"
+
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_model.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/shell_window_ids.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 // static
 WmShelf* WmShelf::ForWindow(WmWindow* window) {
   return window->GetRootWindowController()->GetShelf();
 }
 
+// static
+bool WmShelf::ShelfAlignmentAllowed() {

[sky, 2016/10/07 16:10:17]

optional: rename to CanChangeShelfAlignment().

[msw, 2016/10/07 22:45:57]

Done.

+  if (WmShell::Get()->system_tray_delegate()->IsUserSupervised())
+    return false;
+
+  LoginStatus login_status =
+      WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
+
+  switch (login_status) {
+    case LoginStatus::LOCKED:
+    // Shelf alignment changes can be requested while being locked, but will
+    // be applied upon unlock.
+    case LoginStatus::USER:
+    case LoginStatus::OWNER:
+      return true;
+    case LoginStatus::PUBLIC:
+    case LoginStatus::SUPERVISED:
+    case LoginStatus::GUEST:
+    case LoginStatus::KIOSK_APP:
+    case LoginStatus::NOT_LOGGED_IN:
+      return false;
+  }
+
+  NOTREACHED();
+  return false;
+}
+
 void WmShelf::CreateShelfWidget(WmWindow* root) {
   DCHECK(!shelf_widget_);
   WmWindow* shelf_container =
       root->GetChildByShellWindowId(kShellWindowId_ShelfContainer);
   shelf_widget_.reset(new ShelfWidget(shelf_container, this));
 
   DCHECK(!shelf_layout_manager_);
   shelf_layout_manager_ = shelf_widget_->shelf_layout_manager();
   shelf_layout_manager_->AddObserver(this);
 
@@ skipping 16 matching lines @@
 
 void WmShelf::InitializeShelf() {
   DCHECK(shelf_layout_manager_);
   DCHECK(shelf_widget_);
   DCHECK(!shelf_view_);
   shelf_view_ = shelf_widget_->CreateShelfView();
   shelf_locking_manager_.reset(new ShelfLockingManager(this));
   // When the shelf is created the alignment is unlocked. Chrome will update the
   // alignment later from preferences.
   alignment_ = SHELF_ALIGNMENT_BOTTOM;
-  // NOTE: The delegate may access WmShelf.
-  WmShell::Get()->shelf_delegate()->OnShelfCreated(this);
+  WmShell::Get()->shelf_controller()->NotifyShelfCreated(this);
 }
 
 void WmShelf::ShutdownShelf() {
   DCHECK(shelf_view_);
   shelf_locking_manager_.reset();
   shelf_view_ = nullptr;
-  WmShell::Get()->shelf_delegate()->OnShelfDestroyed(this);
 }
 
 bool WmShelf::IsShelfInitialized() const {
   return !!shelf_view_;
 }
 
 WmWindow* WmShelf::GetWindow() {
   return WmLookup::Get()->GetWindowForWidget(shelf_widget_.get());
 }
 
 void WmShelf::SetAlignment(ShelfAlignment alignment) {
   DCHECK(shelf_layout_manager_);
   DCHECK(shelf_locking_manager_);
 
   if (alignment_ == alignment)
     return;
 
   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_widget_->OnShelfAlignmentChanged();
-  WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(this);
   shelf_layout_manager_->LayoutShelf();
+  WmShell::Get()->shelf_controller()->NotifyShelfAlignmentChanged(this);
   WmShell::Get()->NotifyShelfAlignmentChanged(GetWindow()->GetRootWindow());
 }
 
 bool WmShelf::IsHorizontalAlignment() const {
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return true;
     case SHELF_ALIGNMENT_LEFT:
     case SHELF_ALIGNMENT_RIGHT:
@@ skipping 23 matching lines @@
   return IsHorizontalAlignment() ? horizontal : vertical;
 }
 
 void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   DCHECK(shelf_layout_manager_);
 
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
-  WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(this);
+  WmShell::Get()->shelf_controller()->NotifyShelfAutoHideBehaviorChanged(this);
   WmShell::Get()->NotifyShelfAutoHideBehaviorChanged(
       GetWindow()->GetRootWindow());
 }
 
 ShelfAutoHideState WmShelf::GetAutoHideState() const {
   return shelf_layout_manager_->auto_hide_state();
 }
 
 void WmShelf::UpdateAutoHideState() {
   shelf_layout_manager_->UpdateAutoHideState();
@@ skipping 141 matching lines @@
 
 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