Pass shelf instances, not root windows, for ash context menus.

ash/shelf/shelf_layout_manager.h

 // Copyright 2012 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_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
@@ skipping 72 matching lines @@
 
   explicit ShelfLayoutManager(ShelfWidget* shelf);
   ~ShelfLayoutManager() override;
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
-  // Sets the alignment. Returns true if the alignment got changed. If nothing
-  // has visually be changed, false will be returned. This can happen if either
-  // the alignment was already set, or the shelf is currently locked and cannot
-  // be changed at this time. In the latter case the change will be performed
-  // once the shelf gets unlocked.
-  bool SetAlignment(ShelfAlignment alignment);
+  // Sets the alignment; changes are delayed if the screen is locked.
+  void SetAlignment(ShelfAlignment alignment);
 
   // Returns the desired alignment for the current state, either the user's
-  // set alignment (alignment_) or SHELF_ALIGNMENT_BOTTOM when the screen
-  // is locked.
+  // selected alignment or SHELF_ALIGNMENT_BOTTOM when the screen is locked.
   ShelfAlignment GetAlignment() const;
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   bool updating_bounds() const { return updating_bounds_; }
 
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
 
   // Returns whether the shelf and its contents (shelf, status) are visible
   // on the screen.
   bool IsVisible() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
   // Returns the docked area bounds.
   const gfx::Rect& dock_bounds() const { return dock_bounds_; }
 
   // Returns the bounds within the root window not occupied by the shelf nor the
   // virtual keyboard.
   const gfx::Rect& user_work_area_bounds() const {
     return user_work_area_bounds_;
   }
 
-  // Stops any animations and sets the bounds of the shelf and status
-  // widgets.
+  // Stops any animations and sets the bounds of the shelf and status widgets.
   void LayoutShelf();
 
   // Returns shelf visibility state based on current value of auto hide
   // behavior setting.
   ShelfVisibilityState CalculateShelfVisibility();
 
   // Updates the visibility state.
   void UpdateVisibilityState();
 
   // Invoked by the shelf when the auto-hide state may have changed.
@@ skipping 269 matching lines @@
 
   // The show hide animation duration override or 0 for default.
   int duration_override_in_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_