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

ash/test/test_activation_delegate.h

 // 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.
 
 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "ui/events/event_handler.h"
@@ skipping 26 matching lines @@
   void Clear() {
     activated_count_ = lost_active_count_ = should_activate_count_ = 0;
     window_was_active_ = false;
   }
 
   // Overridden from aura::client::ActivationDelegate:
   bool ShouldActivate() const override;
 
  private:
   // Overridden from aura::client::ActivationChangeObserver:
-  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::Window* window_;
   bool window_was_active_;
   bool activate_;
   int activated_count_;
   int lost_active_count_;
   mutable int should_activate_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_