| Index: chrome/common/extensions/api/extension_action/page_action_handler.cc
|
| diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.cc b/chrome/common/extensions/api/extension_action/page_action_handler.cc
|
| index d607afa05ba8dedc23e274bad29c3ea411d3c43e..7f87e6c0c5759e5f2ddd31735def00a47016858b 100644
|
| --- a/chrome/common/extensions/api/extension_action/page_action_handler.cc
|
| +++ b/chrome/common/extensions/api/extension_action/page_action_handler.cc
|
| @@ -23,7 +23,7 @@ PageActionHandler::PageActionHandler() {
|
| PageActionHandler::~PageActionHandler() {
|
| }
|
|
|
| -bool PageActionHandler::Parse(Extension* extension, string16* error) {
|
| +bool PageActionHandler::Parse(Extension* extension, base::string16* error) {
|
| scoped_ptr<ActionInfo> page_action_info;
|
| const base::DictionaryValue* page_action_value = NULL;
|
|
|
|
|