| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extension_permission_set.h" | 5 #include "chrome/common/extensions/extension_permission_set.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 if (a == "net") | 35 if (a == "net") |
| 36 return b != "com"; | 36 return b != "com"; |
| 37 if (a == "org") | 37 if (a == "org") |
| 38 return b != "com" && b != "net"; | 38 return b != "com" && b != "net"; |
| 39 return false; | 39 return false; |
| 40 } | 40 } |
| 41 | 41 |
| 42 // Names of API modules that can be used without listing it in the | 42 // Names of API modules that can be used without listing it in the |
| 43 // permissions section of the manifest. | 43 // permissions section of the manifest. |
| 44 const char* kNonPermissionModuleNames[] = { | 44 const char* kNonPermissionModuleNames[] = { |
| 45 "app", |
| 45 "browserAction", | 46 "browserAction", |
| 46 "devtools", | 47 "devtools", |
| 47 "extension", | 48 "extension", |
| 48 "i18n", | 49 "i18n", |
| 49 "omnibox", | 50 "omnibox", |
| 50 "pageAction", | 51 "pageAction", |
| 51 "pageActions", | 52 "pageActions", |
| 52 "permissions", | 53 "permissions", |
| 53 "test", | 54 "test", |
| 54 "types" | 55 "types" |
| (...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false)); | 920 std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false)); |
| 920 std::set<std::string> old_hosts_set(GetDistinctHosts(old_list, false, false)); | 921 std::set<std::string> old_hosts_set(GetDistinctHosts(old_list, false, false)); |
| 921 std::set<std::string> new_hosts_only; | 922 std::set<std::string> new_hosts_only; |
| 922 | 923 |
| 923 std::set_difference(new_hosts_set.begin(), new_hosts_set.end(), | 924 std::set_difference(new_hosts_set.begin(), new_hosts_set.end(), |
| 924 old_hosts_set.begin(), old_hosts_set.end(), | 925 old_hosts_set.begin(), old_hosts_set.end(), |
| 925 std::inserter(new_hosts_only, new_hosts_only.begin())); | 926 std::inserter(new_hosts_only, new_hosts_only.begin())); |
| 926 | 927 |
| 927 return !new_hosts_only.empty(); | 928 return !new_hosts_only.empty(); |
| 928 } | 929 } |
| OLD | NEW |