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

Side by Side Diff: third_party/WebKit/Source/modules/permissions/NavigatorPermissions.cpp

Issue 2655463002: Revert of Use a new Supplement constructor in Navigator supplements (part 2) (Closed)
Patch Set: Created 3 years, 10 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "modules/permissions/NavigatorPermissions.h" 5 #include "modules/permissions/NavigatorPermissions.h"
6 6
7 #include "core/frame/Navigator.h" 7 #include "core/frame/Navigator.h"
8 #include "modules/permissions/Permissions.h" 8 #include "modules/permissions/Permissions.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 NavigatorPermissions::NavigatorPermissions(Navigator& navigator) 12 NavigatorPermissions::NavigatorPermissions() {}
13 : Supplement<Navigator>(navigator) {}
14 13
15 // static 14 // static
16 const char* NavigatorPermissions::supplementName() { 15 const char* NavigatorPermissions::supplementName() {
17 return "NavigatorPermissions"; 16 return "NavigatorPermissions";
18 } 17 }
19 18
20 // static 19 // static
21 NavigatorPermissions& NavigatorPermissions::from(Navigator& navigator) { 20 NavigatorPermissions& NavigatorPermissions::from(Navigator& navigator) {
22 NavigatorPermissions* supplement = static_cast<NavigatorPermissions*>( 21 NavigatorPermissions* supplement = static_cast<NavigatorPermissions*>(
23 Supplement<Navigator>::from(navigator, supplementName())); 22 Supplement<Navigator>::from(navigator, supplementName()));
24 if (!supplement) { 23 if (!supplement) {
25 supplement = new NavigatorPermissions(navigator); 24 supplement = new NavigatorPermissions();
26 provideTo(navigator, supplementName(), supplement); 25 provideTo(navigator, supplementName(), supplement);
27 } 26 }
28 return *supplement; 27 return *supplement;
29 } 28 }
30 29
31 // static 30 // static
32 Permissions* NavigatorPermissions::permissions(Navigator& navigator) { 31 Permissions* NavigatorPermissions::permissions(Navigator& navigator) {
33 NavigatorPermissions& self = NavigatorPermissions::from(navigator); 32 NavigatorPermissions& self = NavigatorPermissions::from(navigator);
34 if (!self.m_permissions) 33 if (!self.m_permissions)
35 self.m_permissions = new Permissions(); 34 self.m_permissions = new Permissions();
36 return self.m_permissions.get(); 35 return self.m_permissions.get();
37 } 36 }
38 37
39 DEFINE_TRACE(NavigatorPermissions) { 38 DEFINE_TRACE(NavigatorPermissions) {
40 visitor->trace(m_permissions); 39 visitor->trace(m_permissions);
41 Supplement<Navigator>::trace(visitor); 40 Supplement<Navigator>::trace(visitor);
42 } 41 }
43 42
44 } // namespace blink 43 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698