trunk/src/ui/aura/client/user_action_client.cc - Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient."

Side by Side Diff

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

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

Side by Side Diff: trunk/src/ui/aura/client/user_action_client.cc

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 9 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:

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/aura/client/user_action_client.h"	5 #include "ui/aura/client/user_action_client.h"

6	6

7 #include "ui/aura/window_event_dispatcher.h"	7 #include "ui/aura/window_event_dispatcher.h"

8 #include "ui/aura/window_property.h"	8 #include "ui/aura/window_property.h"

9	9

10 namespace aura {	10 namespace aura {

(...skipping 10 matching lines...) Expand all Loading...
21	21

22 UserActionClient* GetUserActionClient(Window* root_window) {	22 UserActionClient* GetUserActionClient(Window* root_window) {

23 if (root_window)	23 if (root_window)

24 DCHECK_EQ(root_window->GetRootWindow(), root_window);	24 DCHECK_EQ(root_window->GetRootWindow(), root_window);

25 return root_window ?	25 return root_window ?

26 root_window->GetProperty(kRootWindowUserActionClientKey) : NULL;	26 root_window->GetProperty(kRootWindowUserActionClientKey) : NULL;

27 }	27 }

28	28

29 } // namespace client	29 } // namespace client

30 } // namespace aura	30 } // namespace aura

OLD	NEW