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

ash/test/test_activation_delegate.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/test/test_activation_delegate.h"
 
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
@@ skipping 26 matching lines @@
   window_ = window;
   aura::client::SetActivationDelegate(window, this);
   aura::client::SetActivationChangeObserver(window, this);
 }
 
 bool TestActivationDelegate::ShouldActivate() const {
   should_activate_count_++;
   return activate_;
 }
 
-void TestActivationDelegate::OnWindowActivated(aura::Window* gained_active,
-                                               aura::Window* lost_active) {
+void TestActivationDelegate::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
   DCHECK(window_ == gained_active || window_ == lost_active);
   if (window_ == gained_active) {
     activated_count_++;
   } else if (window_ == lost_active) {
     if (lost_active_count_++ == 0)
       window_was_active_ = wm::IsActiveWindow(window_);
   }
 }
 
 }  // namespace test
 }  // namespace ash