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

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

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | ui/aura/window_event_dispatcher.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/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
OLDNEW
« no previous file with comments | « no previous file | ui/aura/window_event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698