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

Side by Side Diff: ui/aura/window_tree_host.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 | « ui/aura/window.cc ('k') | ui/base/ime/chromeos/ime_keyboard.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 #ifndef UI_AURA_WINDOW_TREE_HOST_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
6 #define UI_AURA_WINDOW_TREE_HOST_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/event_types.h" 10 #include "base/event_types.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // by MoveCursorTo() and MoveCursorToHostLocation(). 173 // by MoveCursorTo() and MoveCursorToHostLocation().
174 void MoveCursorToInternal(const gfx::Point& root_location, 174 void MoveCursorToInternal(const gfx::Point& root_location,
175 const gfx::Point& host_location); 175 const gfx::Point& host_location);
176 176
177 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid 177 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid
178 // during its deletion. (Window's dtor notifies observers that may attempt to 178 // during its deletion. (Window's dtor notifies observers that may attempt to
179 // reach back up to access this object which will be valid until the end of 179 // reach back up to access this object which will be valid until the end of
180 // the dtor). 180 // the dtor).
181 Window* window_; // Owning. 181 Window* window_; // Owning.
182 182
183 ObserverList<WindowTreeHostObserver> observers_; 183 base::ObserverList<WindowTreeHostObserver> observers_;
184 184
185 scoped_ptr<WindowEventDispatcher> dispatcher_; 185 scoped_ptr<WindowEventDispatcher> dispatcher_;
186 186
187 scoped_ptr<ui::Compositor> compositor_; 187 scoped_ptr<ui::Compositor> compositor_;
188 188
189 // Last cursor set. Used for testing. 189 // Last cursor set. Used for testing.
190 gfx::NativeCursor last_cursor_; 190 gfx::NativeCursor last_cursor_;
191 gfx::Point last_cursor_request_position_in_host_; 191 gfx::Point last_cursor_request_position_in_host_;
192 192
193 scoped_ptr<ui::ViewProp> prop_; 193 scoped_ptr<ui::ViewProp> prop_;
194 194
195 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); 195 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
196 }; 196 };
197 197
198 } // namespace aura 198 } // namespace aura
199 199
200 #endif // UI_AURA_WINDOW_TREE_HOST_H_ 200 #endif // UI_AURA_WINDOW_TREE_HOST_H_
OLDNEW
« no previous file with comments | « ui/aura/window.cc ('k') | ui/base/ime/chromeos/ime_keyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698