ui/wm/core/default_activation_client.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: ui/wm/core/default_activation_client.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: ui/wm/core/default_activation_client.h

diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h

index 726d88618f4f861b723dbcb298108a5e64ac7387..772a405afc68d2f500e710167b59874173b99e55 100644

--- a/ui/wm/core/default_activation_client.h

+++ b/ui/wm/core/default_activation_client.h

@@ -11,6 +11,7 @@

#include "base/logging.h"

#include "base/observer_list.h"

#include "ui/aura/window_observer.h"

+#include "ui/wm/public/activation_change_observer.h"

#include "ui/wm/public/activation_client.h"

#include "ui/wm/wm_export.h"

@@ -51,6 +52,10 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient,

~DefaultActivationClient() override;

void RemoveActiveWindow(aura::Window* window);

+ void ActivateWindowImpl(

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

+ aura::Window* window);

// This class explicitly does NOT store the active window in a window property

// to make sure that ActivationChangeObserver is not treated as part of the

// aura API. Assumptions to that end will cause tests that use this client to

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