OLD | NEW |
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 #include "ui/views/examples/examples_window_with_content.h" | 5 #include "ui/views/examples/examples_window_with_content.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
8 #include "ui/views/examples/webview_example.h" | 10 #include "ui/views/examples/webview_example.h" |
9 | 11 |
10 namespace views { | 12 namespace views { |
11 namespace examples { | 13 namespace examples { |
12 | 14 |
13 void ShowExamplesWindowWithContent(Operation operation, | 15 void ShowExamplesWindowWithContent(Operation operation, |
14 content::BrowserContext* browser_context, | 16 content::BrowserContext* browser_context, |
15 gfx::NativeWindow window_context) { | 17 gfx::NativeWindow window_context) { |
16 scoped_ptr<ScopedVector<ExampleBase> > extra_examples( | 18 scoped_ptr<ScopedVector<ExampleBase> > extra_examples( |
17 new ScopedVector<ExampleBase>); | 19 new ScopedVector<ExampleBase>); |
18 extra_examples->push_back(new WebViewExample(browser_context)); | 20 extra_examples->push_back(new WebViewExample(browser_context)); |
19 ShowExamplesWindow(operation, window_context, extra_examples.Pass()); | 21 ShowExamplesWindow(operation, window_context, std::move(extra_examples)); |
20 } | 22 } |
21 | 23 |
22 } // namespace examples | 24 } // namespace examples |
23 } // namespace views | 25 } // namespace views |
OLD | NEW |