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

ash/shelf/shelf_window_watcher.cc

 // Copyright 2013 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_window_watcher.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 172 matching lines @@
 
 void ShelfWindowWatcher::StartObservingRemovedWindow(aura::Window* window) {
   observed_removed_windows_.Add(window);
 }
 
 void ShelfWindowWatcher::FinishObservingRemovedWindow(aura::Window* window) {
   observed_removed_windows_.Remove(window);
   RemoveShelfItem(window);
 }
 
-void ShelfWindowWatcher::OnWindowActivated(aura::Window* gained_active,
-                                           aura::Window* lost_active) {
+void ShelfWindowWatcher::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
   if (gained_active && HasShelfItemForWindow(gained_active))
     UpdateShelfItemStatus(gained_active, true);
   if (lost_active && HasShelfItemForWindow(lost_active))
     UpdateShelfItemStatus(lost_active, false);
 }
 
 void ShelfWindowWatcher::OnWindowAdded(aura::Window* window) {
   observed_windows_.Add(window);
 
   if (observed_removed_windows_.IsObserving(window)) {
@@ skipping 75 matching lines @@
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const gfx::Display&,
                                                  uint32_t) {
 }
 
 }  // namespace ash