| Index: chrome/common/extensions/manifest_handlers/app_launch_info.h
|
| diff --git a/chrome/common/extensions/manifest_handlers/app_launch_info.h b/chrome/common/extensions/manifest_handlers/app_launch_info.h
|
| index 8cb28fb70cf265263acb59f78dc5530f52099f8b..d0b0dd9aa45d93b6b44e31efd938a9dc3a883770 100644
|
| --- a/chrome/common/extensions/manifest_handlers/app_launch_info.h
|
| +++ b/chrome/common/extensions/manifest_handlers/app_launch_info.h
|
| @@ -44,11 +44,11 @@ class AppLaunchInfo : public Extension::ManifestData {
|
| // Get the fully resolved absolute launch URL.
|
| static GURL GetFullLaunchURL(const Extension* extension);
|
|
|
| - bool Parse(Extension* extension, string16* error);
|
| + bool Parse(Extension* extension, base::string16* error);
|
|
|
| private:
|
| - bool LoadLaunchURL(Extension* extension, string16* error);
|
| - bool LoadLaunchContainer(Extension* extension, string16* error);
|
| + bool LoadLaunchURL(Extension* extension, base::string16* error);
|
| + bool LoadLaunchContainer(Extension* extension, base::string16* error);
|
| void OverrideLaunchURL(Extension* extension, GURL override_url);
|
|
|
| std::string launch_local_path_;
|
| @@ -69,7 +69,7 @@ class AppLaunchManifestHandler : public ManifestHandler {
|
| AppLaunchManifestHandler();
|
| virtual ~AppLaunchManifestHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
| virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE;
|
|
|
| private:
|
|
|