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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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_targeter_unittest.cc ('k') | ui/aura/window_tree_host.cc » ('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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 const gfx::Point& host_location); 225 const gfx::Point& host_location);
226 226
227 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid 227 // We don't use a scoped_ptr for |window_| since we need this ptr to be valid
228 // during its deletion. (Window's dtor notifies observers that may attempt to 228 // during its deletion. (Window's dtor notifies observers that may attempt to
229 // reach back up to access this object which will be valid until the end of 229 // reach back up to access this object which will be valid until the end of
230 // the dtor). 230 // the dtor).
231 Window* window_; // Owning. 231 Window* window_; // Owning.
232 232
233 base::ObserverList<WindowTreeHostObserver> observers_; 233 base::ObserverList<WindowTreeHostObserver> observers_;
234 234
235 scoped_ptr<WindowEventDispatcher> dispatcher_; 235 std::unique_ptr<WindowEventDispatcher> dispatcher_;
236 236
237 scoped_ptr<ui::Compositor> compositor_; 237 std::unique_ptr<ui::Compositor> compositor_;
238 238
239 // Last cursor set. Used for testing. 239 // Last cursor set. Used for testing.
240 gfx::NativeCursor last_cursor_; 240 gfx::NativeCursor last_cursor_;
241 gfx::Point last_cursor_request_position_in_host_; 241 gfx::Point last_cursor_request_position_in_host_;
242 242
243 scoped_ptr<ui::ViewProp> prop_; 243 std::unique_ptr<ui::ViewProp> prop_;
244 244
245 // The InputMethod instance used to process key events. 245 // The InputMethod instance used to process key events.
246 // If owned it, it is created in GetInputMethod() method; 246 // If owned it, it is created in GetInputMethod() method;
247 // If not owned it, it is passed in through SetSharedInputMethod() method. 247 // If not owned it, it is passed in through SetSharedInputMethod() method.
248 ui::InputMethod* input_method_; 248 ui::InputMethod* input_method_;
249 249
250 // Whether the InputMethod instance is owned by this WindowTreeHost. 250 // Whether the InputMethod instance is owned by this WindowTreeHost.
251 bool owned_input_method_; 251 bool owned_input_method_;
252 252
253 gfx::Insets output_surface_padding_; 253 gfx::Insets output_surface_padding_;
254 254
255 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost); 255 DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
256 }; 256 };
257 257
258 } // namespace aura 258 } // namespace aura
259 259
260 #endif // UI_AURA_WINDOW_TREE_HOST_H_ 260 #endif // UI_AURA_WINDOW_TREE_HOST_H_
OLDNEW
« no previous file with comments | « ui/aura/window_targeter_unittest.cc ('k') | ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698