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

Side by Side Diff: Source/core/frame/Navigator.h

Issue 635853002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/frame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 | « Source/core/frame/Location.h ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 2 Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
3 3
4 This library is free software; you can redistribute it and/or 4 This library is free software; you can redistribute it and/or
5 modify it under the terms of the GNU Library General Public 5 modify it under the terms of the GNU Library General Public
6 License as published by the Free Software Foundation; either 6 License as published by the Free Software Foundation; either
7 version 2 of the License, or (at your option) any later version. 7 version 2 of the License, or (at your option) any later version.
8 8
9 This library is distributed in the hope that it will be useful, 9 This library is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 23 matching lines...) Expand all
34 #include "wtf/RefPtr.h" 34 #include "wtf/RefPtr.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class DOMMimeTypeArray; 38 class DOMMimeTypeArray;
39 class DOMPluginArray; 39 class DOMPluginArray;
40 class LocalFrame; 40 class LocalFrame;
41 41
42 typedef int ExceptionCode; 42 typedef int ExceptionCode;
43 43
44 class Navigator FINAL 44 class Navigator final
45 : public RefCountedWillBeGarbageCollectedFinalized<Navigator> 45 : public RefCountedWillBeGarbageCollectedFinalized<Navigator>
46 , public NavigatorCPU 46 , public NavigatorCPU
47 , public NavigatorID 47 , public NavigatorID
48 , public NavigatorLanguage 48 , public NavigatorLanguage
49 , public NavigatorOnLine 49 , public NavigatorOnLine
50 , public ScriptWrappable 50 , public ScriptWrappable
51 , public DOMWindowProperty 51 , public DOMWindowProperty
52 , public WillBeHeapSupplementable<Navigator> { 52 , public WillBeHeapSupplementable<Navigator> {
53 DEFINE_WRAPPERTYPEINFO(); 53 DEFINE_WRAPPERTYPEINFO();
54 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Navigator); 54 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Navigator);
55 public: 55 public:
56 static PassRefPtrWillBeRawPtr<Navigator> create(LocalFrame* frame) 56 static PassRefPtrWillBeRawPtr<Navigator> create(LocalFrame* frame)
57 { 57 {
58 return adoptRefWillBeNoop(new Navigator(frame)); 58 return adoptRefWillBeNoop(new Navigator(frame));
59 } 59 }
60 60
61 virtual ~Navigator(); 61 virtual ~Navigator();
62 62
63 DOMPluginArray* plugins() const; 63 DOMPluginArray* plugins() const;
64 DOMMimeTypeArray* mimeTypes() const; 64 DOMMimeTypeArray* mimeTypes() const;
65 bool cookieEnabled() const; 65 bool cookieEnabled() const;
66 bool javaEnabled() const; 66 bool javaEnabled() const;
67 67
68 String productSub() const; 68 String productSub() const;
69 String vendor() const; 69 String vendor() const;
70 String vendorSub() const; 70 String vendorSub() const;
71 71
72 virtual String userAgent() const OVERRIDE; 72 virtual String userAgent() const override;
73 73
74 // Relinquishes the storage lock, if one exists. 74 // Relinquishes the storage lock, if one exists.
75 void getStorageUpdates(); 75 void getStorageUpdates();
76 76
77 // NavigatorLanguage 77 // NavigatorLanguage
78 virtual Vector<String> languages() OVERRIDE; 78 virtual Vector<String> languages() override;
79 79
80 virtual void trace(Visitor*) OVERRIDE; 80 virtual void trace(Visitor*) override;
81 81
82 private: 82 private:
83 explicit Navigator(LocalFrame*); 83 explicit Navigator(LocalFrame*);
84 84
85 mutable RefPtrWillBeMember<DOMPluginArray> m_plugins; 85 mutable RefPtrWillBeMember<DOMPluginArray> m_plugins;
86 mutable RefPtrWillBeMember<DOMMimeTypeArray> m_mimeTypes; 86 mutable RefPtrWillBeMember<DOMMimeTypeArray> m_mimeTypes;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // Navigator_h 91 #endif // Navigator_h
OLDNEW
« no previous file with comments | « Source/core/frame/Location.h ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698