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

Side by Side Diff: ui/views/widget/native_widget_aura.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
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_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/focus_change_observer.h" 10 #include "ui/aura/client/focus_change_observer.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 Widget::InitParams::Ownership ownership_; 206 Widget::InitParams::Ownership ownership_;
207 207
208 // Are we in the destructor? 208 // Are we in the destructor?
209 bool destroying_; 209 bool destroying_;
210 210
211 gfx::NativeCursor cursor_; 211 gfx::NativeCursor cursor_;
212 212
213 // The saved window state for exiting full screen state. 213 // The saved window state for exiting full screen state.
214 ui::WindowShowState saved_window_state_; 214 ui::WindowShowState saved_window_state_;
215 215
216 scoped_ptr<TooltipManagerAura> tooltip_manager_; 216 std::unique_ptr<TooltipManagerAura> tooltip_manager_;
217 217
218 // Reorders child windows of |window_| associated with a view based on the 218 // Reorders child windows of |window_| associated with a view based on the
219 // order of the associated views in the widget's view hierarchy. 219 // order of the associated views in the widget's view hierarchy.
220 scoped_ptr<WindowReorderer> window_reorderer_; 220 std::unique_ptr<WindowReorderer> window_reorderer_;
221 221
222 scoped_ptr<DropHelper> drop_helper_; 222 std::unique_ptr<DropHelper> drop_helper_;
223 int last_drop_operation_; 223 int last_drop_operation_;
224 224
225 // The following factory is used for calls to close the NativeWidgetAura 225 // The following factory is used for calls to close the NativeWidgetAura
226 // instance. 226 // instance.
227 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_; 227 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
228 228
229 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 229 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
230 }; 230 };
231 231
232 } // namespace views 232 } // namespace views
233 233
234 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 234 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698