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

chrome/browser/ui/ash/launcher/app_window_launcher_controller.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 "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 109 matching lines @@
 
 // Called from aura::Window::~Window(), before delegate_->OnWindowDestroyed()
 // which destroys AppWindow, so both |window| and the associated AppWindow
 // are valid here.
 void AppWindowLauncherController::OnWindowDestroying(aura::Window* window) {
   if (!ControlsWindow(window))
     return;
   UnregisterApp(window);
 }
 
-void AppWindowLauncherController::OnWindowActivated(aura::Window* new_active,
-                                                    aura::Window* old_active) {
+void AppWindowLauncherController::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* new_active,
+    aura::Window* old_active) {
   // Make the newly active window the active (first) entry in the controller.
   AppWindowLauncherItemController* new_controller =
       ControllerForWindow(new_active);
   if (new_controller) {
     new_controller->SetActiveWindow(new_active);
     owner_->SetItemStatus(new_controller->shelf_id(), ash::STATUS_ACTIVE);
   }
 
   // Mark the old active window's launcher item as running (if different).
   AppWindowLauncherItemController* old_controller =
@@ skipping 91 matching lines @@
   WindowToAppShelfIdMap::iterator iter1 =
       window_to_app_shelf_id_map_.find(window);
   if (iter1 == window_to_app_shelf_id_map_.end())
     return NULL;
   std::string app_shelf_id = iter1->second;
   AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id);
   if (iter2 == app_controller_map_.end())
     return NULL;
   return iter2->second;
 }