| Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
|
| diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
|
| index 3ab9c7e41f8f2a932d94db346fc69a029428d1fd..d237bca67c3ae8bd5c8d5c019981ed7a515c644f 100644
|
| --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
|
| +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
|
| @@ -34,7 +34,7 @@ class SettingsOverridesHandler : public ManifestHandler {
|
| SettingsOverridesHandler();
|
| virtual ~SettingsOverridesHandler();
|
|
|
| - 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;
|
|
|