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

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

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 15 matching lines...) Expand all
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 #ifndef SettingsDelegate_h 31 #ifndef SettingsDelegate_h
32 #define SettingsDelegate_h 32 #define SettingsDelegate_h
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "wtf/Allocator.h" 35 #include "wtf/Allocator.h"
36 #include "wtf/OwnPtr.h" 36 #include <memory>
37 #include "wtf/PassOwnPtr.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 class Settings; 40 class Settings;
42 41
43 class CORE_EXPORT SettingsDelegate { 42 class CORE_EXPORT SettingsDelegate {
44 DISALLOW_NEW(); 43 DISALLOW_NEW();
45 public: 44 public:
46 explicit SettingsDelegate(PassOwnPtr<Settings>); 45 explicit SettingsDelegate(std::unique_ptr<Settings>);
47 virtual ~SettingsDelegate(); 46 virtual ~SettingsDelegate();
48 47
49 Settings* settings() const { return m_settings.get(); } 48 Settings* settings() const { return m_settings.get(); }
50 49
51 // We currently use an enum instead of individual invalidation 50 // We currently use an enum instead of individual invalidation
52 // functions to make generating Settings.in slightly easier. 51 // functions to make generating Settings.in slightly easier.
53 enum ChangeType { 52 enum ChangeType {
54 StyleChange, 53 StyleChange,
55 ViewportDescriptionChange, 54 ViewportDescriptionChange,
56 ViewportRuleChange, 55 ViewportRuleChange,
57 DNSPrefetchingChange, 56 DNSPrefetchingChange,
58 ImageLoadingChange, 57 ImageLoadingChange,
59 TextAutosizingChange, 58 TextAutosizingChange,
60 FontFamilyChange, 59 FontFamilyChange,
61 AcceleratedCompositingChange, 60 AcceleratedCompositingChange,
62 MediaQueryChange, 61 MediaQueryChange,
63 AccessibilityStateChange, 62 AccessibilityStateChange,
64 TextTrackKindUserPreferenceChange, 63 TextTrackKindUserPreferenceChange,
65 }; 64 };
66 65
67 virtual void settingsChanged(ChangeType) = 0; 66 virtual void settingsChanged(ChangeType) = 0;
68 67
69 protected: 68 protected:
70 OwnPtr<Settings> const m_settings; 69 std::unique_ptr<Settings> const m_settings;
71 }; 70 };
72 71
73 } // namespace blink 72 } // namespace blink
74 73
75 #endif // SettingsDelegate_h 74 #endif // SettingsDelegate_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Settings.cpp ('k') | third_party/WebKit/Source/core/frame/SettingsDelegate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698