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

ash/shelf/shelf_window_watcher.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 85 matching lines @@
   // and when the drag completes added back. When this happens we don't want to
   // remove the shelf item. StartObservingRemovedWindow, if necessary, attaches
   // an observer. When done, FinishObservingRemovedWindow() is invoked.
   void StartObservingRemovedWindow(aura::Window* window);
 
   // Stop observing |window| by RemovedWindowObserver and remove an item
   // associated with |window|.
   void FinishObservingRemovedWindow(aura::Window* window);
 
   // aura::client::ActivationChangeObserver overrides:
-  void OnWindowActivated(aura::Window* gained_active,
-                         aura::Window* lost_active) override;
+  void OnWindowActivated(
+      aura::client::ActivationChangeObserver::ActivationReason reason,
+      aura::Window* gained_active,
+      aura::Window* lost_active) override;
 
   // aura::WindowObserver overrides:
   void OnWindowAdded(aura::Window* window) override;
   void OnWillRemoveWindow(aura::Window* window) override;
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
 
   // gfx::DisplayObserver overrides:
@@ skipping 22 matching lines @@
   // Holds all observed activation clients.
   ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
       aura::client::ActivationChangeObserver> observed_activation_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_