| Index: chrome/common/extensions/manifest_handlers/externally_connectable.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable.cc b/chrome/common/extensions/manifest_handlers/externally_connectable.cc
|
| index 7be1d2391788a3873e32cd57aa055759159bc48f..cacb13ae1f8eb180c0d0261793e633282cd63055 100644
|
| --- a/chrome/common/extensions/manifest_handlers/externally_connectable.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/externally_connectable.cc
|
| @@ -56,7 +56,7 @@ ExternallyConnectableHandler::ExternallyConnectableHandler() {}
|
| ExternallyConnectableHandler::~ExternallyConnectableHandler() {}
|
|
|
| bool ExternallyConnectableHandler::Parse(Extension* extension,
|
| - string16* error) {
|
| + base::string16* error) {
|
| const base::Value* externally_connectable = NULL;
|
| CHECK(extension->manifest()->Get(keys::kExternallyConnectable,
|
| &externally_connectable));
|
| @@ -91,7 +91,7 @@ ExternallyConnectableInfo* ExternallyConnectableInfo::Get(
|
| scoped_ptr<ExternallyConnectableInfo> ExternallyConnectableInfo::FromValue(
|
| const base::Value& value,
|
| std::vector<InstallWarning>* install_warnings,
|
| - string16* error) {
|
| + base::string16* error) {
|
| scoped_ptr<ExternallyConnectable> externally_connectable =
|
| ExternallyConnectable::FromValue(value, error);
|
| if (!externally_connectable)
|
|
|