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

ui/views/controls/menu/menu_message_loop_aura.cc

 // Copyright 2014 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/views/controls/menu/menu_message_loop_aura.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 42 matching lines @@
   ActivationChangeObserverImpl(MenuController* controller, aura::Window* root)
       : controller_(controller), root_(root) {
     aura::client::GetActivationClient(root_)->AddObserver(this);
     root_->AddObserver(this);
     root_->AddPreTargetHandler(this);
   }
 
   ~ActivationChangeObserverImpl() override { Cleanup(); }
 
   // 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 {
     if (!controller_->drag_in_progress())
       controller_->CancelAll();
   }
 
   // aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override { Cleanup(); }
 
   // ui::EventHandler:
   void OnCancelMode(ui::CancelModeEvent* event) override {
     controller_->CancelAll();
@@ skipping 115 matching lines @@
   if (ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->StopCurrentEventStream();
 #endif
 }
 
 void MenuMessageLoopAura::ClearOwner() {
   owner_ = NULL;
 }
 
 }  // namespace views