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

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

Issue 814313002: Revert of Use template specialization to generate WindowProperty code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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:
View unified diff | Download patch
« no previous file with comments | « ui/aura/client/aura_constants.cc ('k') | ui/aura/window.h » ('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/focus_client.h" 5 #include "ui/aura/client/focus_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 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*)
10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::FocusClient*) 11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::FocusClient*)
11 12
12 namespace aura { 13 namespace aura {
13 namespace client { 14 namespace client {
14 15
15 DEFINE_WINDOW_PROPERTY_KEY(FocusClient*, kRootWindowFocusClientKey, NULL); 16 DEFINE_WINDOW_PROPERTY_KEY(FocusClient*, kRootWindowFocusClientKey, NULL);
16 17
17 void SetFocusClient(Window* root_window, FocusClient* client) { 18 void SetFocusClient(Window* root_window, FocusClient* client) {
18 DCHECK_EQ(root_window->GetRootWindow(), root_window); 19 DCHECK_EQ(root_window->GetRootWindow(), root_window);
19 root_window->SetProperty(kRootWindowFocusClientKey, client); 20 root_window->SetProperty(kRootWindowFocusClientKey, client);
20 } 21 }
21 22
22 FocusClient* GetFocusClient(Window* window) { 23 FocusClient* GetFocusClient(Window* window) {
23 return GetFocusClient(static_cast<const Window*>(window)); 24 return GetFocusClient(static_cast<const Window*>(window));
24 } 25 }
25 26
26 FocusClient* GetFocusClient(const Window* window) { 27 FocusClient* GetFocusClient(const Window* window) {
27 const Window* root_window = window->GetRootWindow(); 28 const Window* root_window = window->GetRootWindow();
28 return root_window ? 29 return root_window ?
29 root_window->GetProperty(kRootWindowFocusClientKey) : NULL; 30 root_window->GetProperty(kRootWindowFocusClientKey) : NULL;
30 } 31 }
31 32
32 } // namespace client 33 } // namespace client
33 } // namespace aura 34 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/aura_constants.cc ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698