| Index: chrome/common/extensions/manifest_url_handler.h
|
| diff --git a/chrome/common/extensions/manifest_url_handler.h b/chrome/common/extensions/manifest_url_handler.h
|
| index 181171e7f6652a199d513eb6a99275d896c47a99..057589b3cff35ba3ebbdd82f2f5ac5a01c6fb57a 100644
|
| --- a/chrome/common/extensions/manifest_url_handler.h
|
| +++ b/chrome/common/extensions/manifest_url_handler.h
|
| @@ -67,7 +67,7 @@ class DevToolsPageHandler : public ManifestHandler {
|
| DevToolsPageHandler();
|
| virtual ~DevToolsPageHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
|
|
| private:
|
| virtual const std::vector<std::string> Keys() const OVERRIDE;
|
| @@ -81,7 +81,7 @@ class HomepageURLHandler : public ManifestHandler {
|
| HomepageURLHandler();
|
| virtual ~HomepageURLHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
|
|
| private:
|
| virtual const std::vector<std::string> Keys() const OVERRIDE;
|
| @@ -95,7 +95,7 @@ class UpdateURLHandler : public ManifestHandler {
|
| UpdateURLHandler();
|
| virtual ~UpdateURLHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
|
|
| private:
|
| virtual const std::vector<std::string> Keys() const OVERRIDE;
|
| @@ -109,7 +109,7 @@ class OptionsPageHandler : public ManifestHandler {
|
| OptionsPageHandler();
|
| virtual ~OptionsPageHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
| virtual bool Validate(const Extension* extension,
|
| std::string* error,
|
| std::vector<InstallWarning>* warnings) const OVERRIDE;
|
| @@ -126,7 +126,7 @@ class URLOverridesHandler : public ManifestHandler {
|
| URLOverridesHandler();
|
| virtual ~URLOverridesHandler();
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
|
|
|
| private:
|
| virtual const std::vector<std::string> Keys() const OVERRIDE;
|
|
|