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

ui/wm/core/shadow_controller.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 "ui/wm/core/shadow_controller.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 95 matching lines @@
   friend class base::RefCounted<Impl>;
   friend class ShadowController;
   friend class ShadowController::TestApi;
 
   typedef std::map<aura::Window*, linked_ptr<Shadow> > WindowShadowMap;
 
   Impl();
   ~Impl() override;
 
   // Forwarded from ShadowController.
-  void OnWindowActivated(aura::Window* gained_active,
+  void OnWindowActivated(ActivationReason reason,
+                         aura::Window* gained_active,
                          aura::Window* lost_active);
 
   // Checks if |window| is visible and contains a property requesting a shadow.
   bool ShouldShowShadowForWindow(aura::Window* window) const;
 
   // Returns |window|'s shadow from |window_shadows_|, or NULL if no shadow
   // exists.
   Shadow* GetShadowForWindow(aura::Window* window);
 
   // Updates the shadow styles for windows when activation changes.
@@ skipping 49 matching lines @@
   Shadow* shadow = GetShadowForWindow(window);
   if (shadow)
     shadow->SetContentBounds(gfx::Rect(new_bounds.size()));
 }
 
 void ShadowController::Impl::OnWindowDestroyed(aura::Window* window) {
   window_shadows_.erase(window);
   observer_manager_.Remove(window);
 }
 
-void ShadowController::Impl::OnWindowActivated(aura::Window* gained_active,
+void ShadowController::Impl::OnWindowActivated(ActivationReason reason,
+                                               aura::Window* gained_active,
                                                aura::Window* lost_active) {
   if (gained_active) {
     Shadow* shadow = GetShadowForWindow(gained_active);
     if (shadow && !ShouldUseSmallShadowForWindow(gained_active))
       shadow->SetStyle(Shadow::STYLE_ACTIVE);
   }
   if (lost_active) {
     Shadow* shadow = GetShadowForWindow(lost_active);
     if (shadow && !ShouldUseSmallShadowForWindow(lost_active)) {
       shadow->SetStyle(GetShadowStyleForWindowLosingActive(lost_active,
@@ skipping 67 matching lines @@
     : activation_client_(activation_client),
       impl_(Impl::GetInstance()) {
   // Watch for window activation changes.
   activation_client_->AddObserver(this);
 }
 
 ShadowController::~ShadowController() {
   activation_client_->RemoveObserver(this);
 }
 
-void ShadowController::OnWindowActivated(aura::Window* gained_active,
+void ShadowController::OnWindowActivated(ActivationReason reason,
+                                         aura::Window* gained_active,
                                          aura::Window* lost_active) {
-  impl_->OnWindowActivated(gained_active, lost_active);
+  impl_->OnWindowActivated(reason, gained_active, lost_active);
 }
 
 // ShadowController::TestApi ---------------------------------------------------
 
 Shadow* ShadowController::TestApi::GetShadowForWindow(aura::Window* window) {
   return controller_->impl_->GetShadowForWindow(window);
 }
 
 }  // namespace wm