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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 
 #include <map>
 #include <string>
 
@@ skipping 38 matching lines @@
 
   // A shortcut to call the ChromeLauncherController's UpdateAppState().
   void UpdateAppItemState(content::WebContents* contents,
                           ChromeLauncherController::AppState app_state);
 
   // A shortcut to call the BrowserShortcutLauncherItemController's
   // UpdateBrowserItemState().
   void UpdateBrowserItemState();
 
   // aura::client::ActivationChangeObserver overrides:
-  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;
 
   // aura::WindowObserver overrides:
   void OnWindowDestroyed(aura::Window* window) override;
 
   // chrome::BrowserListObserver overrides:
   void OnBrowserAdded(Browser* browser) override;
   void OnBrowserRemoved(Browser* browser) override;
 
   // gfx::DisplayObserver overrides:
   void OnDisplayAdded(const gfx::Display& new_display) override;
@@ skipping 65 matching lines @@
   ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
 
   BrowserToAppIDMap browser_to_app_id_map_;
   WebContentsToObserverMap webcontents_to_observer_map_;
   scoped_ptr<SettingsWindowObserver> settings_window_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_