| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 ExtensionAPIPermission::kTtsEngine, "ttsEngine", | 317 ExtensionAPIPermission::kTtsEngine, "ttsEngine", |
| 318 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE, | 318 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE, |
| 319 ExtensionPermissionMessage::kTtsEngine, none); | 319 ExtensionPermissionMessage::kTtsEngine, none); |
| 320 RegisterPermission( | 320 RegisterPermission( |
| 321 ExtensionAPIPermission::kWebNavigation, "webNavigation", 0, | 321 ExtensionAPIPermission::kWebNavigation, "webNavigation", 0, |
| 322 ExtensionPermissionMessage::kNone, none); | 322 ExtensionPermissionMessage::kNone, none); |
| 323 RegisterPermission( | 323 RegisterPermission( |
| 324 ExtensionAPIPermission::kWebRequest, "webRequest", 0, | 324 ExtensionAPIPermission::kWebRequest, "webRequest", 0, |
| 325 ExtensionPermissionMessage::kNone, none); | 325 ExtensionPermissionMessage::kNone, none); |
| 326 RegisterPermission( | 326 RegisterPermission( |
| 327 ExtensionAPIPermission::kWebRequestBlocking, "webRequestBlocking", 0, |
| 328 ExtensionPermissionMessage::kNone, none); |
| 329 RegisterPermission( |
| 327 ExtensionAPIPermission::kWebSocketProxyPrivate, | 330 ExtensionAPIPermission::kWebSocketProxyPrivate, |
| 328 "webSocketProxyPrivate", 0, | 331 "webSocketProxyPrivate", 0, |
| 329 ExtensionPermissionMessage::kNone, none); | 332 ExtensionPermissionMessage::kNone, none); |
| 330 | 333 |
| 331 // Private permissions | 334 // Private permissions |
| 332 RegisterPermission( | 335 RegisterPermission( |
| 333 ExtensionAPIPermission::kChromeosInfoPrivate, "chromeosInfoPrivate", 0, | 336 ExtensionAPIPermission::kChromeosInfoPrivate, "chromeosInfoPrivate", 0, |
| 334 ExtensionPermissionMessage::kNone, component_only); | 337 ExtensionPermissionMessage::kNone, component_only); |
| 335 RegisterPermission( | 338 RegisterPermission( |
| 336 ExtensionAPIPermission::kFileBrowserPrivate, "fileBrowserPrivate", 0, | 339 ExtensionAPIPermission::kFileBrowserPrivate, "fileBrowserPrivate", 0, |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 859 std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false)); | 862 std::set<std::string> new_hosts_set(GetDistinctHosts(new_list, false, false)); |
| 860 std::set<std::string> old_hosts_set(GetDistinctHosts(old_list, false, false)); | 863 std::set<std::string> old_hosts_set(GetDistinctHosts(old_list, false, false)); |
| 861 std::set<std::string> new_hosts_only; | 864 std::set<std::string> new_hosts_only; |
| 862 | 865 |
| 863 std::set_difference(new_hosts_set.begin(), new_hosts_set.end(), | 866 std::set_difference(new_hosts_set.begin(), new_hosts_set.end(), |
| 864 old_hosts_set.begin(), old_hosts_set.end(), | 867 old_hosts_set.begin(), old_hosts_set.end(), |
| 865 std::inserter(new_hosts_only, new_hosts_only.begin())); | 868 std::inserter(new_hosts_only, new_hosts_only.begin())); |
| 866 | 869 |
| 867 return !new_hosts_only.empty(); | 870 return !new_hosts_only.empty(); |
| 868 } | 871 } |
| OLD | NEW |