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

Side by Side Diff: Source/modules/permissions/PermissionStatus.cpp

Issue 1194963002: Add PermissionStatus.state and deprecate PermissionStatus.status. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use DeprecateAs Created 5 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "modules/permissions/PermissionStatus.h" 6 #include "modules/permissions/PermissionStatus.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/events/Event.h" 10 #include "core/events/Event.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 ASSERT(executionContext()); 126 ASSERT(executionContext());
127 127
128 m_listening = false; 128 m_listening = false;
129 WebPermissionClient* client = permissionClient(executionContext()); 129 WebPermissionClient* client = permissionClient(executionContext());
130 if (!client) 130 if (!client)
131 return; 131 return;
132 client->stopListening(this); 132 client->stopListening(this);
133 } 133 }
134 134
135 String PermissionStatus::status() const 135 String PermissionStatus::state() const
136 { 136 {
137 switch (m_status) { 137 switch (m_status) {
138 case WebPermissionStatusGranted: 138 case WebPermissionStatusGranted:
139 return "granted"; 139 return "granted";
140 case WebPermissionStatusDenied: 140 case WebPermissionStatusDenied:
141 return "denied"; 141 return "denied";
142 case WebPermissionStatusPrompt: 142 case WebPermissionStatusPrompt:
143 return "prompt"; 143 return "prompt";
144 } 144 }
145 145
146 ASSERT_NOT_REACHED(); 146 ASSERT_NOT_REACHED();
147 return "denied"; 147 return "denied";
148 } 148 }
149 149
150 DEFINE_TRACE(PermissionStatus) 150 DEFINE_TRACE(PermissionStatus)
151 { 151 {
152 RefCountedGarbageCollectedEventTargetWithInlineData<PermissionStatus>::trace (visitor); 152 RefCountedGarbageCollectedEventTargetWithInlineData<PermissionStatus>::trace (visitor);
153 ActiveDOMObject::trace(visitor); 153 ActiveDOMObject::trace(visitor);
154 } 154 }
155 155
156 } // namespace blink 156 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/permissions/PermissionStatus.h ('k') | Source/modules/permissions/PermissionStatus.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698