Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9440)

Unified Diff: chrome/common/extensions/command.h

Issue 105473003: Add explicit base namespace to string16 users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/command.h
diff --git a/chrome/common/extensions/command.h b/chrome/common/extensions/command.h
index 67f0d40f389feffec256726cbb55872713b4f3f8..0ea3fe4924cfc3a3a5637d29bfeb59008845a30e 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_;
};
« no previous file with comments | « chrome/common/extensions/api/url_handlers/url_handlers_parser.cc ('k') | chrome/common/extensions/command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698