Chromium Code Reviews| Index: chrome/common/extensions/permissions/chrome_api_permissions.cc |
| diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc |
| index 330ee12ad971a98ed2b425ddf776b5a6b592f376..373a7b53bac8e6252b6647a2bd4c2da5827a7e36 100644 |
| --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc |
| +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc |
| @@ -106,8 +106,8 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() |
| {APIPermission::kFontSettings, "fontSettings", |
| APIPermissionInfo::kFlagCannotBeOptional}, |
| {APIPermission::kHistory, "history", APIPermissionInfo::kFlagNone, |
| - IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY, |
| - PermissionMessage::kBrowsingHistory}, |
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE, |
| + PermissionMessage::kBrowsingHistoryWrite}, |
| {APIPermission::kIdltest, "idltest"}, |
| {APIPermission::kIdle, "idle"}, |
| {APIPermission::kInfobars, "infobars"}, |
| @@ -128,7 +128,8 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() |
| {APIPermission::kPrivacy, "privacy", APIPermissionInfo::kFlagNone, |
| IDS_EXTENSION_PROMPT_WARNING_PRIVACY, PermissionMessage::kPrivacy}, |
| {APIPermission::kProcesses, "processes", APIPermissionInfo::kFlagNone, |
| - IDS_EXTENSION_PROMPT_WARNING_TABS, PermissionMessage::kTabs}, |
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, |
| + PermissionMessage::kBrowsingHistoryRead}, |
|
wjywbs
2014/06/13 15:42:47
The processes API is probably not related to histo
|
| {APIPermission::kSessions, "sessions"}, |
| {APIPermission::kSignedInDevices, "signedInDevices", |
| APIPermissionInfo::kFlagNone, |
| @@ -139,10 +140,11 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() |
| IDS_EXTENSION_PROMPT_WARNING_SYNCFILESYSTEM, |
| PermissionMessage::kSyncFileSystem}, |
| {APIPermission::kTab, "tabs", APIPermissionInfo::kFlagNone, |
| - IDS_EXTENSION_PROMPT_WARNING_TABS, PermissionMessage::kTabs}, |
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, |
| + PermissionMessage::kBrowsingHistoryRead}, |
| {APIPermission::kTopSites, "topSites", APIPermissionInfo::kFlagNone, |
| - IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY, |
| - PermissionMessage::kBrowsingHistory}, |
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, |
| + PermissionMessage::kBrowsingHistoryRead}, |
| {APIPermission::kTts, "tts", 0, APIPermissionInfo::kFlagCannotBeOptional}, |
| {APIPermission::kTtsEngine, "ttsEngine", |
| APIPermissionInfo::kFlagCannotBeOptional, |
| @@ -151,8 +153,8 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() |
| APIPermissionInfo::kFlagCannotBeOptional, |
| IDS_EXTENSION_PROMPT_WARNING_WALLPAPER, PermissionMessage::kWallpaper}, |
| {APIPermission::kWebNavigation, "webNavigation", |
| - APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_TABS, |
| - PermissionMessage::kTabs}, |
| + APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, |
| + PermissionMessage::kBrowsingHistoryRead}, |
| {APIPermission::kWebRequest, "webRequest"}, |
| {APIPermission::kWebRequestBlocking, "webRequestBlocking"}, |
| {APIPermission::kWebView, "webview", |