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

Side by Side Diff: extensions/common/permissions/permissions_data.cc

Issue 980353003: Extensions: Switch to new permission message system, part I (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review (the easy parts) Created 5 years, 9 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "extensions/common/permissions/permissions_data.h" 5 #include "extensions/common/permissions/permissions_data.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/public/common/url_constants.h" 8 #include "content/public/common/url_constants.h"
9 #include "extensions/common/constants.h" 9 #include "extensions/common/constants.h"
10 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 } 189 }
190 190
191 bool PermissionsData::HasHostPermission(const GURL& url) const { 191 bool PermissionsData::HasHostPermission(const GURL& url) const {
192 return active_permissions()->HasExplicitAccessToOrigin(url); 192 return active_permissions()->HasExplicitAccessToOrigin(url);
193 } 193 }
194 194
195 bool PermissionsData::HasEffectiveAccessToAllHosts() const { 195 bool PermissionsData::HasEffectiveAccessToAllHosts() const {
196 return active_permissions()->HasEffectiveAccessToAllHosts(); 196 return active_permissions()->HasEffectiveAccessToAllHosts();
197 } 197 }
198 198
199 PermissionMessages PermissionsData::GetPermissionMessages() const { 199 PermissionMessages PermissionsData::GetLegacyPermissionMessages() const {
200 if (ShouldSkipPermissionWarnings(extension_id_)) { 200 if (ShouldSkipPermissionWarnings(extension_id_)) {
201 return PermissionMessages(); 201 return PermissionMessages();
202 } else { 202 } else {
203 return PermissionMessageProvider::Get()->GetPermissionMessages( 203 return PermissionMessageProvider::Get()->GetPermissionMessages(
204 active_permissions().get(), manifest_type_); 204 active_permissions().get(), manifest_type_);
205 } 205 }
206 } 206 }
207 207
208 std::vector<base::string16> PermissionsData::GetPermissionMessageStrings() 208 std::vector<base::string16> PermissionsData::GetLegacyPermissionMessageStrings()
209 const { 209 const {
210 if (ShouldSkipPermissionWarnings(extension_id_)) 210 if (ShouldSkipPermissionWarnings(extension_id_))
211 return std::vector<base::string16>(); 211 return std::vector<base::string16>();
212 return PermissionMessageProvider::Get()->GetWarningMessages( 212 return PermissionMessageProvider::Get()->GetWarningMessages(
213 active_permissions().get(), manifest_type_); 213 active_permissions().get(), manifest_type_);
214 } 214 }
215 215
216 std::vector<base::string16> 216 std::vector<base::string16>
217 PermissionsData::GetPermissionMessageDetailsStrings() const { 217 PermissionsData::GetLegacyPermissionMessageDetailsStrings() const {
218 if (ShouldSkipPermissionWarnings(extension_id_)) 218 if (ShouldSkipPermissionWarnings(extension_id_))
219 return std::vector<base::string16>(); 219 return std::vector<base::string16>();
220 return PermissionMessageProvider::Get()->GetWarningMessagesDetails( 220 return PermissionMessageProvider::Get()->GetWarningMessagesDetails(
221 active_permissions().get(), manifest_type_); 221 active_permissions().get(), manifest_type_);
222 } 222 }
223 223
224 CoalescedPermissionMessages PermissionsData::GetCoalescedPermissionMessages() 224 CoalescedPermissionMessages PermissionsData::GetCoalescedPermissionMessages()
225 const { 225 const {
226 return PermissionMessageProvider::Get()->GetCoalescedPermissionMessages( 226 return PermissionMessageProvider::Get()->GetCoalescedPermissionMessages(
227 PermissionMessageProvider::Get()->GetAllPermissionIDs( 227 PermissionMessageProvider::Get()->GetAllPermissionIDs(
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 return ACCESS_WITHHELD; 381 return ACCESS_WITHHELD;
382 382
383 if (error) { 383 if (error) {
384 *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage, 384 *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage,
385 document_url.spec()); 385 document_url.spec());
386 } 386 }
387 return ACCESS_DENIED; 387 return ACCESS_DENIED;
388 } 388 }
389 389
390 } // namespace extensions 390 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698