chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc - Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

Issue 1151133003: Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Uploaded diff based on dependant CL. Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/app_window_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/browser_status_monitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

index ac0ae5f5c3c67bc66c3218252f6e352deaa11729..ee37e6508101060a12f22952b8557a7cf7927877 100644

--- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

@@ -127,8 +127,10 @@ void AppWindowLauncherController::OnWindowDestroying(aura::Window* window) {

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);