| Index: chrome/common/extensions/api/extension_action/action_info.cc
|
| diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc
|
| index 715af4d568febac1b0fd76e4367c8db6cea81151..badd2c87de72bf4ada1979edf9970627014b194c 100644
|
| --- a/chrome/common/extensions/api/extension_action/action_info.cc
|
| +++ b/chrome/common/extensions/api/extension_action/action_info.cc
|
| @@ -55,7 +55,7 @@ ActionInfo::~ActionInfo() {
|
| // static
|
| scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
|
| const base::DictionaryValue* dict,
|
| - string16* error) {
|
| + base::string16* error) {
|
| scoped_ptr<ActionInfo> result(new ActionInfo());
|
|
|
| if (extension->manifest_version() == 1) {
|
|
|