Chromium Code Reviews| 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/screen_position_client.h" | 5 #include "ui/aura/client/screen_position_client.h" |
| 6 | 6 |
| 7 #include "ui/aura/window_event_dispatcher.h" | 7 //#include "ui/aura/window_event_dispatcher.h" |
|
sky
2014/09/23 21:40:40
Fix this.
MRV
2014/09/24 02:47:57
Done.
| |
| 8 #include "ui/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
| 9 | 9 |
| 10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ScreenPositionClient*) | 10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ScreenPositionClient*) |
| 11 | 11 |
| 12 namespace aura { | 12 namespace aura { |
| 13 namespace client { | 13 namespace client { |
| 14 | 14 |
| 15 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ScreenPositionClient*, | 15 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ScreenPositionClient*, |
| 16 kScreenPositionClientKey, | 16 kScreenPositionClientKey, |
| 17 NULL); | 17 NULL); |
| 18 | 18 |
| 19 void SetScreenPositionClient(Window* root_window, | 19 void SetScreenPositionClient(Window* root_window, |
| 20 ScreenPositionClient* client) { | 20 ScreenPositionClient* client) { |
| 21 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 21 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
| 22 root_window->SetProperty(kScreenPositionClientKey, client); | 22 root_window->SetProperty(kScreenPositionClientKey, client); |
| 23 } | 23 } |
| 24 | 24 |
| 25 ScreenPositionClient* GetScreenPositionClient(const Window* root_window) { | 25 ScreenPositionClient* GetScreenPositionClient(const Window* root_window) { |
| 26 if (root_window) | 26 if (root_window) |
| 27 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 27 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
| 28 return root_window ? | 28 return root_window ? |
| 29 root_window->GetProperty(kScreenPositionClientKey) : NULL; | 29 root_window->GetProperty(kScreenPositionClientKey) : NULL; |
| 30 } | 30 } |
| 31 | 31 |
| 32 } // namespace client | 32 } // namespace client |
| 33 } // namespace aura | 33 } // namespace aura |
| OLD | NEW |