| Index: extensions/common/permissions/permission_message.h
|
| diff --git a/extensions/common/permissions/permission_message.h b/extensions/common/permissions/permission_message.h
|
| index b4d53b7a4fa6a15a981cd5d577e38e3fcdcd5aca..275aa1c60d11198e1e398e9593fd8238a8d507e4 100644
|
| --- a/extensions/common/permissions/permission_message.h
|
| +++ b/extensions/common/permissions/permission_message.h
|
| @@ -86,8 +86,10 @@ class PermissionMessage {
|
| kNone_not_greater_than_kUnknown);
|
|
|
| // Creates the corresponding permission message.
|
| - PermissionMessage(ID id, const string16& message);
|
| - PermissionMessage(ID id, const string16& message, const string16& details);
|
| + PermissionMessage(ID id, const base::string16& message);
|
| + PermissionMessage(ID id,
|
| + const base::string16& message,
|
| + const base::string16& details);
|
| ~PermissionMessage();
|
|
|
| // Gets the id of the permission message, which can be used in UMA
|
| @@ -96,12 +98,12 @@ class PermissionMessage {
|
|
|
| // Gets a localized message describing this permission. Please note that
|
| // the message will be empty for message types TYPE_NONE and TYPE_UNKNOWN.
|
| - const string16& message() const { return message_; }
|
| + const base::string16& message() const { return message_; }
|
|
|
| // Gets a localized message describing the details for this permission. Please
|
| // note that the message will be empty for message types TYPE_NONE and
|
| // TYPE_UNKNOWN.
|
| - const string16& details() const { return details_; }
|
| + const base::string16& details() const { return details_; }
|
|
|
| // Comparator to work with std::set.
|
| bool operator<(const PermissionMessage& that) const {
|
| @@ -114,8 +116,8 @@ class PermissionMessage {
|
|
|
| private:
|
| ID id_;
|
| - string16 message_;
|
| - string16 details_;
|
| + base::string16 message_;
|
| + base::string16 details_;
|
| };
|
|
|
| typedef std::vector<PermissionMessage> PermissionMessages;
|
|
|