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

Side by Side Diff: chrome/common/extensions/permissions/chrome_permission_message_rules.cc

Issue 2470193002: Introduce networking.onc as an alias for networkingPrivate (Closed)
Patch Set: allow optional permission Created 4 years 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 "chrome/common/extensions/permissions/chrome_permission_message_rules.h " 5 #include "chrome/common/extensions/permissions/chrome_permission_message_rules.h "
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 {}}, 513 {}},
514 {IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE, 514 {IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
515 {APIPermission::kAudioCapture}, 515 {APIPermission::kAudioCapture},
516 {}}, 516 {}},
517 {IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE, 517 {IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
518 {APIPermission::kVideoCapture}, 518 {APIPermission::kVideoCapture},
519 {}}, 519 {}},
520 520
521 // Network-related permissions. 521 // Network-related permissions.
522 {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE, 522 {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE,
523 {APIPermission::kNetworkingOnc},
524 // Adding networkingPrivate as an optional permission for this rule so
525 // the permission is removed from the available permission set when the
526 // next rule (for networkingPrivate permission) is considered - without
527 // this, IDS_EXTENSION_PROMPT_WARNING_NETWORK_PRIVATE would be duplicated
528 // for manifests that have both networking.onc and networkingPrivate
529 // permission.
530 {APIPermission::kNetworkingPrivate}},
531 {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_PRIVATE,
523 {APIPermission::kNetworkingPrivate}, 532 {APIPermission::kNetworkingPrivate},
524 {}}, 533 {}},
525 {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_CONFIG, 534 {IDS_EXTENSION_PROMPT_WARNING_NETWORKING_CONFIG,
526 {APIPermission::kNetworkingConfig}, 535 {APIPermission::kNetworkingConfig},
527 {}}, 536 {}},
528 {IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE, 537 {IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE,
529 {APIPermission::kNetworkState}, 538 {APIPermission::kNetworkState},
530 {}}, 539 {}},
531 {IDS_EXTENSION_PROMPT_WARNING_VPN, {APIPermission::kVpnProvider}, {}}, 540 {IDS_EXTENSION_PROMPT_WARNING_VPN, {APIPermission::kVpnProvider}, {}},
532 {IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE, 541 {IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 {IDS_EXTENSION_PROMPT_WARNING_DISPLAY_SOURCE, 633 {IDS_EXTENSION_PROMPT_WARNING_DISPLAY_SOURCE,
625 {APIPermission::kDisplaySource}, 634 {APIPermission::kDisplaySource},
626 {}}, 635 {}},
627 }; 636 };
628 637
629 return std::vector<ChromePermissionMessageRule>( 638 return std::vector<ChromePermissionMessageRule>(
630 rules_arr, rules_arr + arraysize(rules_arr)); 639 rules_arr, rules_arr + arraysize(rules_arr));
631 } 640 }
632 641
633 } // namespace extensions 642 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698