| Index: chrome/common/custom_handlers/protocol_handler.cc
|
| diff --git a/chrome/common/custom_handlers/protocol_handler.cc b/chrome/common/custom_handlers/protocol_handler.cc
|
| index 8b4d893b2b926cf8ae45421515e57ef15fd2a853..f8af6a9000b486547b39d2ca815de836c89a6377 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);
|
|
|