diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:42:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 04:42:59 +0000 |
| commit | bf9e91846cf57ce4a921b7901fd840c4f804e828 (patch) | |
| tree | 7cc7e21e25bf801f164416833fb8e469b492775c /ui/aura/client/screen_position_client.cc | |
| parent | 6c6862b8c22e1adc3fed74f5621e78ea09eea76c (diff) | |
| download | chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.zip chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.tar.gz chromium_src-bf9e91846cf57ce4a921b7901fd840c4f804e828.tar.bz2 | |
Make aura::clients take Window instead of RootWindow
In preparation for hiding/changing RootWindow more...
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/38423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/client/screen_position_client.cc')
| -rw-r--r-- | ui/aura/client/screen_position_client.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/aura/client/screen_position_client.cc b/ui/aura/client/screen_position_client.cc index ac13156..1fb7521 100644 --- a/ui/aura/client/screen_position_client.cc +++ b/ui/aura/client/screen_position_client.cc @@ -16,13 +16,17 @@ DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ScreenPositionClient*, kScreenPositionClientKey, NULL); -void SetScreenPositionClient(RootWindow* window, +void SetScreenPositionClient(Window* root_window, ScreenPositionClient* client) { - window->SetProperty(kScreenPositionClientKey, client); + DCHECK_EQ(root_window->GetRootWindow(), root_window); + root_window->SetProperty(kScreenPositionClientKey, client); } -ScreenPositionClient* GetScreenPositionClient(const RootWindow* window) { - return window ? window->GetProperty(kScreenPositionClientKey) : NULL; +ScreenPositionClient* GetScreenPositionClient(const Window* root_window) { + if (root_window) + DCHECK_EQ(root_window->GetRootWindow(), root_window); + return root_window ? + root_window->GetProperty(kScreenPositionClientKey) : NULL; } } // namespace client |