| 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..3b19952a3956b96e720c32985ed1f6298c4b10b6 100644
|
| --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc
|
| +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
|
| @@ -106,7 +106,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
|
| {APIPermission::kFontSettings, "fontSettings",
|
| APIPermissionInfo::kFlagCannotBeOptional},
|
| {APIPermission::kHistory, "history", APIPermissionInfo::kFlagNone,
|
| - IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY,
|
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE,
|
| PermissionMessage::kBrowsingHistory},
|
| {APIPermission::kIdltest, "idltest"},
|
| {APIPermission::kIdle, "idle"},
|
| @@ -128,7 +128,7 @@ 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::kTabs},
|
| {APIPermission::kSessions, "sessions"},
|
| {APIPermission::kSignedInDevices, "signedInDevices",
|
| APIPermissionInfo::kFlagNone,
|
| @@ -139,10 +139,9 @@ 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::kTabs},
|
| {APIPermission::kTopSites, "topSites", APIPermissionInfo::kFlagNone,
|
| - IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY,
|
| - PermissionMessage::kBrowsingHistory},
|
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, PermissionMessage::kTabs},
|
| {APIPermission::kTts, "tts", 0, APIPermissionInfo::kFlagCannotBeOptional},
|
| {APIPermission::kTtsEngine, "ttsEngine",
|
| APIPermissionInfo::kFlagCannotBeOptional,
|
| @@ -151,7 +150,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
|
| APIPermissionInfo::kFlagCannotBeOptional,
|
| IDS_EXTENSION_PROMPT_WARNING_WALLPAPER, PermissionMessage::kWallpaper},
|
| {APIPermission::kWebNavigation, "webNavigation",
|
| - APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_TABS,
|
| + APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ,
|
| PermissionMessage::kTabs},
|
| {APIPermission::kWebRequest, "webRequest"},
|
| {APIPermission::kWebRequestBlocking, "webRequestBlocking"},
|
|
|