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

chrome/browser/ui/ash/launcher/browser_status_monitor.cc

 // Copyright 2013 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/browser_status_monitor.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
@@ skipping 146 matching lines @@
   if (app_state == ChromeLauncherController::APP_STATE_REMOVED ||
       (browser && launcher_controller_->IsBrowserFromActiveUser(browser)))
     launcher_controller_->UpdateAppState(contents, app_state);
 }
 
 void BrowserStatusMonitor::UpdateBrowserItemState() {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       UpdateBrowserItemState();
 }
 
-void BrowserStatusMonitor::OnWindowActivated(aura::Window* gained_active,
-                                             aura::Window* lost_active) {
+void BrowserStatusMonitor::OnWindowActivated(
+    aura::client::ActivationChangeObserver::ActivationReason reason,
+    aura::Window* gained_active,
+    aura::Window* lost_active) {
   Browser* browser = NULL;
   content::WebContents* contents_from_gained = NULL;
   content::WebContents* contents_from_lost = NULL;
   // Update active webcontents's app item state of |lost_active|, if existed.
   if (lost_active) {
     browser = chrome::FindBrowserWithWindow(lost_active);
     if (browser)
       contents_from_lost = browser->tab_strip_model()->GetActiveWebContents();
     if (contents_from_lost) {
       UpdateAppItemState(
@@ skipping 208 matching lines @@
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }