Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/client/tooltip_client.cc ('k') | ui/aura/client/visibility_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/root_window.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 {
11 namespace client { 11 namespace client {
12 12
13 DEFINE_WINDOW_PROPERTY_KEY(UserActionClient*, 13 DEFINE_WINDOW_PROPERTY_KEY(UserActionClient*,
14 kRootWindowUserActionClientKey, 14 kRootWindowUserActionClientKey,
15 NULL); 15 NULL);
16 16
17 void SetUserActionClient(Window* root_window, UserActionClient* client) { 17 void SetUserActionClient(Window* root_window, UserActionClient* client) {
18 DCHECK_EQ(root_window->GetRootWindow(), root_window); 18 DCHECK_EQ(root_window->GetRootWindow(), root_window);
19 root_window->SetProperty(kRootWindowUserActionClientKey, client); 19 root_window->SetProperty(kRootWindowUserActionClientKey, client);
20 } 20 }
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
OLDNEW
« no previous file with comments | « ui/aura/client/tooltip_client.cc ('k') | ui/aura/client/visibility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698