| Index: chrome/common/extensions/manifest_handlers/app_launch_info.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/app_launch_info.cc b/chrome/common/extensions/manifest_handlers/app_launch_info.cc
|
| index 1a09122c5d26a660840daa423453b501b0083ef6..a3b3ac592ec71d3c5f689684d6e9aa0838d37d78 100644
|
| --- a/chrome/common/extensions/manifest_handlers/app_launch_info.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/app_launch_info.cc
|
| @@ -118,12 +118,12 @@ bool AppLaunchInfo::LoadLaunchURL(Extension* extension, base::string16* error) {
|
| // web URL.
|
| if (extension->manifest()->Get(keys::kLaunchLocalPath, &temp)) {
|
| if (extension->manifest()->Get(keys::kLaunchWebURL, NULL)) {
|
| - *error = ASCIIToUTF16(errors::kLaunchPathAndURLAreExclusive);
|
| + *error = base::ASCIIToUTF16(errors::kLaunchPathAndURLAreExclusive);
|
| return false;
|
| }
|
|
|
| if (extension->manifest()->Get(keys::kWebURLs, NULL)) {
|
| - *error = ASCIIToUTF16(errors::kLaunchPathAndExtentAreExclusive);
|
| + *error = base::ASCIIToUTF16(errors::kLaunchPathAndExtentAreExclusive);
|
| return false;
|
| }
|
|
|
| @@ -166,7 +166,7 @@ bool AppLaunchInfo::LoadLaunchURL(Extension* extension, base::string16* error) {
|
|
|
| launch_web_url_ = url;
|
| } else if (extension->is_legacy_packaged_app()) {
|
| - *error = ASCIIToUTF16(errors::kLaunchURLRequired);
|
| + *error = base::ASCIIToUTF16(errors::kLaunchURLRequired);
|
| return false;
|
| }
|
|
|
| @@ -233,7 +233,7 @@ bool AppLaunchInfo::LoadLaunchContainer(Extension* extension,
|
|
|
| std::string launch_container_string;
|
| if (!tmp_launcher_container->GetAsString(&launch_container_string)) {
|
| - *error = ASCIIToUTF16(errors::kInvalidLaunchContainer);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidLaunchContainer);
|
| return false;
|
| }
|
|
|
| @@ -242,7 +242,7 @@ bool AppLaunchInfo::LoadLaunchContainer(Extension* extension,
|
| } else if (launch_container_string == values::kLaunchContainerTab) {
|
| launch_container_ = LAUNCH_CONTAINER_TAB;
|
| } else {
|
| - *error = ASCIIToUTF16(errors::kInvalidLaunchContainer);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidLaunchContainer);
|
| return false;
|
| }
|
|
|
|
|