| Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc
|
| diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
|
| index fb17ffd16a40967572d22bfdf3a12a44656b62e3..0a3779d9eb01389c517300e11ff81906c72b0ac9 100644
|
| --- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
|
| +++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
|
| @@ -281,19 +281,18 @@ bool ExtensionActionSetBadgeBackgroundColorFunction::RunExtensionAction() {
|
| }
|
|
|
| bool ExtensionActionGetTitleFunction::RunExtensionAction() {
|
| - result_.reset(Value::CreateStringValue(extension_action_->GetTitle(tab_id_)));
|
| + SetResult(Value::CreateStringValue(extension_action_->GetTitle(tab_id_)));
|
| return true;
|
| }
|
|
|
| bool ExtensionActionGetPopupFunction::RunExtensionAction() {
|
| - result_.reset(Value::CreateStringValue(
|
| - extension_action_->GetPopupUrl(tab_id_).spec()));
|
| + SetResult(
|
| + Value::CreateStringValue(extension_action_->GetPopupUrl(tab_id_).spec()));
|
| return true;
|
| }
|
|
|
| bool ExtensionActionGetBadgeTextFunction::RunExtensionAction() {
|
| - result_.reset(Value::CreateStringValue(
|
| - extension_action_->GetBadgeText(tab_id_)));
|
| + SetResult(Value::CreateStringValue(extension_action_->GetBadgeText(tab_id_)));
|
| return true;
|
| }
|
|
|
| @@ -304,6 +303,6 @@ bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
|
| list->Append(Value::CreateIntegerValue(SkColorGetG(color)));
|
| list->Append(Value::CreateIntegerValue(SkColorGetB(color)));
|
| list->Append(Value::CreateIntegerValue(SkColorGetA(color)));
|
| - result_.reset(list);
|
| + SetResult(list);
|
| return true;
|
| }
|
|
|