| Index: extensions/common/permissions/permissions_data.cc
|
| diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
|
| index f43d1d774334574f285be50693a00b30bd69ae8e..3e6e85f9252a894e1724d7c2ce44e6c4c6928a7b 100644
|
| --- a/extensions/common/permissions/permissions_data.cc
|
| +++ b/extensions/common/permissions/permissions_data.cc
|
| @@ -95,7 +95,7 @@ bool ParseHelper(Extension* extension,
|
| const char* key,
|
| APIPermissionSet* api_permissions,
|
| URLPatternSet* host_permissions,
|
| - string16* error) {
|
| + base::string16* error) {
|
| if (!extension->manifest()->HasKey(key))
|
| return true;
|
|
|
| @@ -429,11 +429,11 @@ PermissionMessages PermissionsData::GetPermissionMessages(
|
| }
|
|
|
| // static
|
| -std::vector<string16> PermissionsData::GetPermissionMessageStrings(
|
| +std::vector<base::string16> PermissionsData::GetPermissionMessageStrings(
|
| const Extension* extension) {
|
| base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
|
| if (ShouldSkipPermissionWarnings(extension)) {
|
| - return std::vector<string16>();
|
| + return std::vector<base::string16>();
|
| } else {
|
| return PermissionMessageProvider::Get()->GetWarningMessages(
|
| GetActivePermissions(extension), extension->GetType());
|
| @@ -441,11 +441,11 @@ std::vector<string16> PermissionsData::GetPermissionMessageStrings(
|
| }
|
|
|
| // static
|
| -std::vector<string16> PermissionsData::GetPermissionMessageDetailsStrings(
|
| +std::vector<base::string16> PermissionsData::GetPermissionMessageDetailsStrings(
|
| const Extension* extension) {
|
| base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
|
| if (ShouldSkipPermissionWarnings(extension)) {
|
| - return std::vector<string16>();
|
| + return std::vector<base::string16>();
|
| } else {
|
| return PermissionMessageProvider::Get()->GetWarningMessagesDetails(
|
| GetActivePermissions(extension), extension->GetType());
|
| @@ -561,7 +561,8 @@ bool PermissionsData::CanCaptureVisiblePage(const Extension* extension,
|
| return false;
|
| }
|
|
|
| -bool PermissionsData::ParsePermissions(Extension* extension, string16* error) {
|
| +bool PermissionsData::ParsePermissions(Extension* extension,
|
| + base::string16* error) {
|
| initial_required_permissions_.reset(new InitialPermissions);
|
| if (!ParseHelper(extension,
|
| keys::kPermissions,
|
|
|