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 fe3fbea69f4be9bc5e5e4c4f919e448f32226a0e..7b3d07ec73282dc14c9f1b3044d83baa348d5cb5 100644 |
--- a/chrome/common/extensions/manifest_handlers/app_launch_info.cc |
+++ b/chrome/common/extensions/manifest_handlers/app_launch_info.cc |
@@ -27,7 +27,7 @@ bool ReadLaunchDimension(const extensions::Manifest* manifest, |
const char* key, |
int* target, |
bool is_valid_container, |
- string16* error) { |
+ base::string16* error) { |
const Value* temp = NULL; |
if (manifest->Get(key, &temp)) { |
if (!is_valid_container) { |
@@ -104,14 +104,14 @@ GURL AppLaunchInfo::GetFullLaunchURL(const Extension* extension) { |
return extension->url().Resolve(info.launch_local_path_); |
} |
-bool AppLaunchInfo::Parse(Extension* extension, string16* error) { |
+bool AppLaunchInfo::Parse(Extension* extension, base::string16* error) { |
if (!LoadLaunchURL(extension, error) || |
!LoadLaunchContainer(extension, error)) |
return false; |
return true; |
} |
-bool AppLaunchInfo::LoadLaunchURL(Extension* extension, string16* error) { |
+bool AppLaunchInfo::LoadLaunchURL(Extension* extension, base::string16* error) { |
const Value* temp = NULL; |
// Launch URL can be either local (to chrome-extension:// root) or an absolute |
@@ -225,7 +225,7 @@ bool AppLaunchInfo::LoadLaunchURL(Extension* extension, string16* error) { |
} |
bool AppLaunchInfo::LoadLaunchContainer(Extension* extension, |
- string16* error) { |
+ base::string16* error) { |
const Value* tmp_launcher_container = NULL; |
if (!extension->manifest()->Get(keys::kLaunchContainer, |
&tmp_launcher_container)) |
@@ -299,7 +299,8 @@ AppLaunchManifestHandler::AppLaunchManifestHandler() { |
AppLaunchManifestHandler::~AppLaunchManifestHandler() { |
} |
-bool AppLaunchManifestHandler::Parse(Extension* extension, string16* error) { |
+bool AppLaunchManifestHandler::Parse(Extension* extension, |
+ base::string16* error) { |
scoped_ptr<AppLaunchInfo> info(new AppLaunchInfo); |
if (!info->Parse(extension, error)) |
return false; |