[Merge to M58] cros: Fix shelf overlaps bottom of maximized window in guest session

ash/common/shelf/shelf_controller.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_controller.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
@@ skipping 145 matching lines @@
 
 void ShelfController::AddObserver(
     mojom::ShelfObserverAssociatedPtrInfo observer) {
   mojom::ShelfObserverAssociatedPtr observer_ptr;
   observer_ptr.Bind(std::move(observer));
   observers_.AddPtr(std::move(observer_ptr));
 }
 
 void ShelfController::SetAlignment(ShelfAlignment alignment,
                                    int64_t display_id) {
-  if (!ash::WmShelf::CanChangeShelfAlignment())
-    return;
-
   WmShelf* shelf = GetShelfForDisplay(display_id);
   // TODO(jamescook): The initialization check should not be necessary, but
   // otherwise this wrongly tries to set the alignment on a secondary display
   // during login before the ShelfLockingManager and ShelfView are created.
   if (shelf && shelf->IsShelfInitialized())
     shelf->SetAlignment(alignment);
 }
 
 void ShelfController::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide,
                                           int64_t display_id) {
@@ skipping 56 matching lines @@
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id];
   int index = model_.ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_.ItemByID(shelf_id);
   item.image = GetShelfIconFromBitmap(image);
   model_.Set(index, item);
 }
 
 }  // namespace ash