ash/shelf/shelf_window_watcher.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: ash/shelf/shelf_window_watcher.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

Index: ash/shelf/shelf_window_watcher.cc

diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc

index 3744687a40544f2d0b6382e51a250a84ab73f005..546d21294cc614518450dfbcb87f0ff98590af4b 100644

--- a/ash/shelf/shelf_window_watcher.cc

+++ b/ash/shelf/shelf_window_watcher.cc

@@ -190,8 +190,10 @@ void ShelfWindowWatcher::FinishObservingRemovedWindow(aura::Window* window) {

RemoveShelfItem(window);

}

-void ShelfWindowWatcher::OnWindowActivated(aura::Window* gained_active,

- aura::Window* lost_active) {

+void ShelfWindowWatcher::OnWindowActivated(

+ aura::client::ActivationChangeObserver::ActivationReason reason,

+ aura::Window* gained_active,

+ aura::Window* lost_active) {

if (gained_active && HasShelfItemForWindow(gained_active))

UpdateShelfItemStatus(gained_active, true);

if (lost_active && HasShelfItemForWindow(lost_active))

« no previous file with comments | « ash/shelf/shelf_window_watcher.h ('k') | ash/shell.h » ('j') | no next file with comments »