ash/shelf/shelf_layout_manager.h - 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_layout_manager.h

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_layout_manager.h

diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h

index 96f405ecfac0ebee053f191c04e305bde3056da3..86344471a5706848bb8fae5f7a3488663d24c7dd 100644

--- a/ash/shelf/shelf_layout_manager.h

+++ b/ash/shelf/shelf_layout_manager.h

@@ -176,8 +176,10 @@ class ASH_EXPORT ShelfLayoutManager

void OnLockStateChanged(bool locked) override;

// Overriden from aura::client::ActivationChangeObserver:

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

// Overridden from ash::LockStateObserver:

void OnLockStateEvent(LockStateObserver::EventType event) override;

« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »