ui/views/widget/desktop_aura/desktop_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/desktop_aura/desktop_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/desktop_aura/desktop_native_widget_aura.cc

diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

index c82ced73bb74b4175c43a6b5da51e8dc80031b95..33629f9a719439469c0cf76299a1c77a35340dd8 100644

--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -1111,8 +1111,10 @@ bool DesktopNativeWidgetAura::ShouldActivate() const {

// DesktopNativeWidgetAura, aura::client::ActivationChangeObserver

// implementation:

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

- aura::Window* lost_active) {

+void DesktopNativeWidgetAura::OnWindowActivated(

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

+ aura::Window* gained_active,

+ aura::Window* lost_active) {

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

if (gained_active == content_window_ && restore_focus_on_activate_) {

restore_focus_on_activate_ = false;

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