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

Side by Side Diff: ui/views/examples/examples_window.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/examples/examples_main.cc ('k') | ui/views/examples/examples_window.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_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_ 5 #ifndef UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
6 #define UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_ 6 #define UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include <memory>
9
9 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
10 #include "ui/gfx/native_widget_types.h" 11 #include "ui/gfx/native_widget_types.h"
11 #include "ui/views/examples/views_examples_export.h" 12 #include "ui/views/examples/views_examples_export.h"
12 13
13 namespace aura { 14 namespace aura {
14 class Window; 15 class Window;
15 } 16 }
16 17
17 namespace views { 18 namespace views {
18 namespace examples { 19 namespace examples {
19 20
20 class ExampleBase; 21 class ExampleBase;
21 22
22 enum Operation { 23 enum Operation {
23 DO_NOTHING_ON_CLOSE = 0, 24 DO_NOTHING_ON_CLOSE = 0,
24 QUIT_ON_CLOSE, 25 QUIT_ON_CLOSE,
25 }; 26 };
26 27
27 // Shows a window with the views examples in it. |extra_examples| contains any 28 // Shows a window with the views examples in it. |extra_examples| contains any
28 // additional examples to add. |window_context| is used to determine where the 29 // additional examples to add. |window_context| is used to determine where the
29 // window should be created (see |Widget::InitParams::context| for details). 30 // window should be created (see |Widget::InitParams::context| for details).
30 VIEWS_EXAMPLES_EXPORT void ShowExamplesWindow( 31 VIEWS_EXAMPLES_EXPORT void ShowExamplesWindow(
31 Operation operation, 32 Operation operation,
32 gfx::NativeWindow window_context, 33 gfx::NativeWindow window_context,
33 scoped_ptr<ScopedVector<ExampleBase> > extra_examples); 34 std::unique_ptr<ScopedVector<ExampleBase>> extra_examples);
34 35
35 } // namespace examples 36 } // namespace examples
36 } // namespace views 37 } // namespace views
37 38
38 #endif // UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_ 39 #endif // UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/views/examples/examples_main.cc ('k') | ui/views/examples/examples_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698