summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/command.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 21:38:49 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 21:38:49 +0000
commit428fac1f2102da6f5b6085add20e97ce7eb04698 (patch)
treeda6005e86eb430600c142ae63ee4ede310970d9f /chrome/common/extensions/command.h
parent7c49a005cb4b95014aef8218a3a90ebbb3e02a78 (diff)
downloadchromium_src-428fac1f2102da6f5b6085add20e97ce7eb04698.zip
chromium_src-428fac1f2102da6f5b6085add20e97ce7eb04698.tar.gz
chromium_src-428fac1f2102da6f5b6085add20e97ce7eb04698.tar.bz2
Add explicit base namespace to string16 users.
This changes callers in chrome/common. TBR=sky Review URL: https://codereview.chromium.org/105473003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/command.h')
-rw-r--r--chrome/common/extensions/command.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/extensions/command.h b/chrome/common/extensions/command.h
index 67f0d40..0ea3fe4 100644
--- a/chrome/common/extensions/command.h
+++ b/chrome/common/extensions/command.h
@@ -25,7 +25,7 @@ class Command {
public:
Command();
Command(const std::string& command_name,
- const string16& description,
+ const base::string16& description,
const std::string& accelerator,
bool global);
~Command();
@@ -46,7 +46,7 @@ class Command {
bool Parse(const base::DictionaryValue* command,
const std::string& command_name,
int index,
- string16* error);
+ base::string16* error);
// Convert a Command object from |extension| to a DictionaryValue.
// |active| specifies whether the command is active or not.
@@ -56,7 +56,7 @@ class Command {
// Accessors:
const std::string& command_name() const { return command_name_; }
const ui::Accelerator& accelerator() const { return accelerator_; }
- const string16& description() const { return description_; }
+ const base::string16& description() const { return description_; }
bool global() const { return global_; }
// Setter:
@@ -70,7 +70,7 @@ class Command {
private:
std::string command_name_;
ui::Accelerator accelerator_;
- string16 description_;
+ base::string16 description_;
bool global_;
};