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

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 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.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 229 matching lines @@
 
 bool ShelfLayoutManager::IsVisible() const {
   // status_area_widget() may be NULL during the shutdown.
   return shelf_->status_area_widget() &&
       shelf_->status_area_widget()->IsVisible() &&
       (state_.visibility_state == SHELF_VISIBLE ||
        (state_.visibility_state == SHELF_AUTO_HIDE &&
         state_.auto_hide_state == SHELF_AUTO_HIDE_SHOWN));
 }
 
-bool ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
+void ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
-    return false;
+    return;
 
   alignment_ = alignment;
   // The shelf will itself move to the bottom while locked or obscured by user
   // login. If a request is sent to move while being obscured, we postpone the
   // move until the user session is resumed.
-  if (IsAlignmentLocked())
-    return false;
-
-  // This should not be called during the lock screen transitions.
-  shelf_->SetAlignment(alignment);
-  LayoutShelf();
-  return true;
+  if (!IsAlignmentLocked()) {
+    shelf_->SetAlignment(alignment);
+    LayoutShelf();
+    Shell::GetInstance()->OnShelfAlignmentChanged(
+        shelf_->GetNativeWindow()->GetRootWindow());
+  }
 }
 
 ShelfAlignment ShelfLayoutManager::GetAlignment() const {
   // When the screen is locked or a user gets added, the shelf is forced into
   // bottom alignment.
   if (IsAlignmentLocked())
     return SHELF_ALIGNMENT_BOTTOM;
   return alignment_;
 }
 
@@ skipping 14 matching lines @@
   if (shelf_->shelf()) {
     // Update insets in ShelfWindowTargeter when shelf bounds change.
     FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
                       WillChangeVisibilityState(visibility_state()));
   }
 }
 
 ShelfVisibilityState ShelfLayoutManager::CalculateShelfVisibility() {
   switch(auto_hide_behavior_) {
     case SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS:
-#if defined(OS_WIN)
-      // Disable shelf auto-hide behavior on screen sides in Metro mode.
-      if (GetAlignment() != SHELF_ALIGNMENT_BOTTOM)
-        return SHELF_VISIBLE;
-#endif
       return SHELF_AUTO_HIDE;
     case SHELF_AUTO_HIDE_BEHAVIOR_NEVER:
       return SHELF_VISIBLE;
     case SHELF_AUTO_HIDE_ALWAYS_HIDDEN:
       return SHELF_HIDDEN;
   }
   return SHELF_VISIBLE;
 }
 
 void ShelfLayoutManager::UpdateVisibilityState() {
@@ skipping 828 matching lines @@
   TargetBounds target_bounds;
   CalculateTargetBounds(state_, &target_bounds);
   UpdateBoundsAndOpacity(target_bounds, true, NULL);
   UpdateVisibilityState();
 }
 
 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
   shelf_->SetAlignment(GetAlignment());
   UpdateVisibilityState();
   LayoutShelf();
+  Shell::GetInstance()->OnShelfAlignmentChanged(
+      shelf_->GetNativeWindow()->GetRootWindow());
 }
 
 bool ShelfLayoutManager::IsAlignmentLocked() const {
   if (state_.is_screen_locked)
     return true;
   // The session state becomes active at the start of transitioning to a user
   // session, however the session is considered blocked until the full UI is
   // ready. Exit early to allow for proper layout.
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (session_state_delegate->GetSessionState() ==
       SessionStateDelegate::SESSION_STATE_ACTIVE) {
     return false;
   }
   if (session_state_delegate->IsUserSessionBlocked() ||
       state_.is_adding_user_screen) {
     return true;
   }
   return false;
 }
 
 }  // namespace ash