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

Side by Side Diff: third_party/WebKit/Source/core/frame/SettingsDelegate.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/frame/SettingsDelegate.h" 31 #include "core/frame/SettingsDelegate.h"
32 32
33 #include "core/frame/Settings.h" 33 #include "core/frame/Settings.h"
34 #include <memory>
34 35
35 namespace blink { 36 namespace blink {
36 37
37 SettingsDelegate::SettingsDelegate(PassOwnPtr<Settings> settings) 38 SettingsDelegate::SettingsDelegate(std::unique_ptr<Settings> settings)
38 : m_settings(std::move(settings)) 39 : m_settings(std::move(settings))
39 { 40 {
40 if (m_settings) 41 if (m_settings)
41 m_settings->setDelegate(this); 42 m_settings->setDelegate(this);
42 } 43 }
43 44
44 SettingsDelegate::~SettingsDelegate() 45 SettingsDelegate::~SettingsDelegate()
45 { 46 {
46 if (m_settings) 47 if (m_settings)
47 m_settings->setDelegate(0); 48 m_settings->setDelegate(0);
48 } 49 }
49 50
50 } // namespace blink 51 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/SettingsDelegate.h ('k') | third_party/WebKit/Source/core/frame/TopControls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698