Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...).

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 511 matching lines @@
   }
 }
 
 void ShelfLayoutManager::OnLockStateChanged(bool locked) {
   // Force the shelf to layout for alignment (bottom if locked, restore
   // the previous alignment otherwise).
   state_.is_screen_locked = locked;
   UpdateShelfVisibilityAfterLoginUIChange();
 }
 
-void ShelfLayoutManager::OnWindowActivated(aura::Window* gained_active,
-                                           aura::Window* lost_active) {
+void ShelfLayoutManager::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
   UpdateAutoHideStateNow();
 }
 
 bool ShelfLayoutManager::IsHorizontalAlignment() const {
   return GetAlignment() == SHELF_ALIGNMENT_BOTTOM ||
          GetAlignment() == SHELF_ALIGNMENT_TOP;
 }
 
 // static
 ShelfLayoutManager* ShelfLayoutManager::ForShelf(aura::Window* window) {
@@ skipping 647 matching lines @@
     return false;
   }
   if (session_state_delegate->IsUserSessionBlocked() ||
       state_.is_adding_user_screen) {
     return true;
   }
   return false;
 }
 
 }  // namespace ash