summaryrefslogtreecommitdiffstats
path: root/chrome/common/custom_handlers
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/custom_handlers
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/custom_handlers')
-rw-r--r--chrome/common/custom_handlers/protocol_handler.cc6
-rw-r--r--chrome/common/custom_handlers/protocol_handler.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/common/custom_handlers/protocol_handler.cc b/chrome/common/custom_handlers/protocol_handler.cc
index 8b4d893..f8af6a9 100644
--- a/chrome/common/custom_handlers/protocol_handler.cc
+++ b/chrome/common/custom_handlers/protocol_handler.cc
@@ -11,7 +11,7 @@
ProtocolHandler::ProtocolHandler(const std::string& protocol,
const GURL& url,
- const string16& title)
+ const base::string16& title)
: protocol_(protocol),
url_(url),
title_(title) {
@@ -20,7 +20,7 @@ ProtocolHandler::ProtocolHandler(const std::string& protocol,
ProtocolHandler ProtocolHandler::CreateProtocolHandler(
const std::string& protocol,
const GURL& url,
- const string16& title) {
+ const base::string16& title) {
std::string lower_protocol = StringToLowerASCII(protocol);
return ProtocolHandler(lower_protocol, url, title);
}
@@ -49,7 +49,7 @@ ProtocolHandler ProtocolHandler::CreateProtocolHandler(
return EmptyProtocolHandler();
}
std::string protocol, url;
- string16 title;
+ base::string16 title;
value->GetString("protocol", &protocol);
value->GetString("url", &url);
value->GetString("title", &title);
diff --git a/chrome/common/custom_handlers/protocol_handler.h b/chrome/common/custom_handlers/protocol_handler.h
index 6652ba6..dc18be5 100644
--- a/chrome/common/custom_handlers/protocol_handler.h
+++ b/chrome/common/custom_handlers/protocol_handler.h
@@ -17,7 +17,7 @@ class ProtocolHandler {
public:
static ProtocolHandler CreateProtocolHandler(const std::string& protocol,
const GURL& url,
- const string16& title);
+ const base::string16& title);
// Creates a ProtocolHandler with fields from the dictionary. Returns an
// empty ProtocolHandler if the input is invalid.
@@ -48,7 +48,7 @@ class ProtocolHandler {
const std::string& protocol() const { return protocol_; }
const GURL& url() const { return url_;}
- const string16& title() const { return title_; }
+ const base::string16& title() const { return title_; }
bool IsEmpty() const {
return protocol_.empty();
@@ -66,12 +66,12 @@ class ProtocolHandler {
private:
ProtocolHandler(const std::string& protocol,
const GURL& url,
- const string16& title);
+ const base::string16& title);
ProtocolHandler();
std::string protocol_;
GURL url_;
- string16 title_;
+ base::string16 title_;
};
#endif // CHROME_COMMON_CUSTOM_HANDLERS_PROTOCOL_HANDLER_H_