| Index: chrome/common/extensions/api/extension_action/action_info.h
|
| diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h
|
| index c1f0714d3a4ad8b80c83c724e585bb79e902d527..12d7b2bef50b37c45620656775669bef7e8a98b0 100644
|
| --- a/chrome/common/extensions/api/extension_action/action_info.h
|
| +++ b/chrome/common/extensions/api/extension_action/action_info.h
|
| @@ -35,7 +35,7 @@ struct ActionInfo {
|
| // Loads an ActionInfo from the given DictionaryValue.
|
| static scoped_ptr<ActionInfo> Load(const Extension* extension,
|
| const base::DictionaryValue* dict,
|
| - string16* error);
|
| + base::string16* error);
|
|
|
| // Returns the extension's browser action, if any.
|
| static const ActionInfo* GetBrowserActionInfo(const Extension* extension);
|
|
|