ui/views/widget/native_widget_aura.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: ui/views/widget/native_widget_aura.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: ui/views/widget/native_widget_aura.cc

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc

index bf113e6e119de7bcb3ab99b2f21a1d185eba9ef7..92ff22acd056b10bd25a97fa152b9a1083fdce0b 100644

--- a/ui/views/widget/native_widget_aura.cc

+++ b/ui/views/widget/native_widget_aura.cc

@@ -936,8 +936,10 @@ bool NativeWidgetAura::ShouldActivate() const {

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

// NativeWidgetAura, aura::client::ActivationChangeObserver implementation:

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

- aura::Window* lost_active) {

+void NativeWidgetAura::OnWindowActivated(

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

+ aura::Window* gained_active,

+ aura::Window* lost_active) {

DCHECK(window_ == gained_active || window_ == lost_active);

if (GetWidget()->GetFocusManager()) {

if (window_ == gained_active)

« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/wm/core/default_activation_client.h » ('j') | no next file with comments »