ash/wm/panels/panel_layout_manager.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/wm/panels/panel_layout_manager.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/wm/panels/panel_layout_manager.cc

diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc

index 35219d5a501fc27f0a94c9fb359f6a7e501eba67..11f2c1d9afb04fdd16f8c27e438a24bc14ccc12b 100644

--- a/ash/wm/panels/panel_layout_manager.cc

+++ b/ash/wm/panels/panel_layout_manager.cc

@@ -513,8 +513,10 @@ void PanelLayoutManager::OnPostWindowStateTypeChange(

////////////////////////////////////////////////////////////////////////////////

// PanelLayoutManager, aura::client::ActivationChangeObserver implementation:

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

- aura::Window* lost_active) {

+void PanelLayoutManager::OnWindowActivated(

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

+ aura::Window* gained_active,

+ aura::Window* lost_active) {

// Ignore if the panel that is not managed by this was activated.

if (gained_active && gained_active->type() == ui::wm::WINDOW_TYPE_PANEL &&

gained_active->parent() == panel_container_) {

« no previous file with comments | « ash/wm/panels/panel_layout_manager.h ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »