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

Side by Side Diff: ui/views/mus/native_widget_mus.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/views/mus/aura_init.h ('k') | ui/views/mus/native_widget_mus_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MUS_NATIVE_WIDGET_MUS_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 #include <string> 12 #include <string>
12 13
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "components/mus/public/interfaces/window_tree.mojom.h" 16 #include "components/mus/public/interfaces/window_tree.mojom.h"
17 #include "ui/aura/window_delegate.h" 17 #include "ui/aura/window_delegate.h"
18 #include "ui/aura/window_tree_host_observer.h" 18 #include "ui/aura/window_tree_host_observer.h"
19 #include "ui/platform_window/platform_window_delegate.h" 19 #include "ui/platform_window/platform_window_delegate.h"
20 #include "ui/views/mus/mus_export.h" 20 #include "ui/views/mus/mus_export.h"
21 #include "ui/views/widget/native_widget_private.h" 21 #include "ui/views/widget/native_widget_private.h"
22 22
23 namespace aura { 23 namespace aura {
24 namespace client { 24 namespace client {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 internal::NativeWidgetDelegate* native_widget_delegate_; 209 internal::NativeWidgetDelegate* native_widget_delegate_;
210 210
211 const mus::mojom::SurfaceType surface_type_; 211 const mus::mojom::SurfaceType surface_type_;
212 ui::PlatformWindowState show_state_before_fullscreen_; 212 ui::PlatformWindowState show_state_before_fullscreen_;
213 213
214 // See class documentation for Widget in widget.h for a note about ownership. 214 // See class documentation for Widget in widget.h for a note about ownership.
215 Widget::InitParams::Ownership ownership_; 215 Widget::InitParams::Ownership ownership_;
216 216
217 // Functions with the same name require the mus::WindowObserver to be in 217 // Functions with the same name require the mus::WindowObserver to be in
218 // a separate class. 218 // a separate class.
219 scoped_ptr<MusWindowObserver> mus_window_observer_; 219 std::unique_ptr<MusWindowObserver> mus_window_observer_;
220 220
221 // Aura configuration. 221 // Aura configuration.
222 scoped_ptr<SurfaceContextFactory> context_factory_; 222 std::unique_ptr<SurfaceContextFactory> context_factory_;
223 scoped_ptr<WindowTreeHostMus> window_tree_host_; 223 std::unique_ptr<WindowTreeHostMus> window_tree_host_;
224 aura::Window* content_; 224 aura::Window* content_;
225 scoped_ptr<wm::FocusController> focus_client_; 225 std::unique_ptr<wm::FocusController> focus_client_;
226 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 226 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
227 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; 227 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
228 scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_; 228 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
229 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 229 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
230 230
231 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 231 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
232 }; 232 };
233 233
234 } // namespace views 234 } // namespace views
235 235
236 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 236 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/aura_init.h ('k') | ui/views/mus/native_widget_mus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698