ui/aura_shell/activation_controller.h - Issue 8956004: Move ActivationClient/Delegate to client namespace.

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/aura_shell/activation_controller.h

Issue 8956004: Move ActivationClient/Delegate to client namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/aura_shell/activation_controller.h

===================================================================

--- ui/aura_shell/activation_controller.h (revision 114593)

+++ ui/aura_shell/activation_controller.h (working copy)

@@ -18,9 +18,10 @@

namespace internal {

// Exported for unit tests.

-class AURA_SHELL_EXPORT ActivationController : public aura::ActivationClient,

- public aura::WindowObserver,

- public aura::RootWindowObserver {

+class AURA_SHELL_EXPORT ActivationController

+ : public aura::client::ActivationClient,

+ public aura::WindowObserver,

+ public aura::RootWindowObserver {

public:

ActivationController();

virtual ~ActivationController();

@@ -29,7 +30,7 @@

// activation.

static aura::Window* GetActivatableWindow(aura::Window* window);

- // Overridden from aura::ActivationClient:

+ // Overridden from aura::client::ActivationClient:

virtual void ActivateWindow(aura::Window* window) OVERRIDE;

virtual void DeactivateWindow(aura::Window* window) OVERRIDE;

virtual aura::Window* GetActiveWindow() OVERRIDE;

« no previous file with comments | « ui/aura/test/test_activation_client.cc ('k') | ui/aura_shell/activation_controller.cc » ('j') | no next file with comments »