| Index: chrome/browser/extensions/script_badge_controller.cc
|
| diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
|
| index 7efd6a99a4e32176d5c80e69c245e44681624ff8..ce93f45d2d12c6467eeb687dfa513f6ac5b778d5 100644
|
| --- a/chrome/browser/extensions/script_badge_controller.cc
|
| +++ b/chrome/browser/extensions/script_badge_controller.cc
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/common/extensions/extension_action.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| +#include "chrome/common/extensions/extension_switch_utils.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| @@ -24,7 +25,10 @@ namespace extensions {
|
| ScriptBadgeController::ScriptBadgeController(TabContents* tab_contents)
|
| : content::WebContentsObserver(tab_contents->web_contents()),
|
| script_executor_(tab_contents->web_contents()),
|
| - tab_contents_(tab_contents) {}
|
| + tab_contents_(tab_contents) {
|
| + CHECK(switch_utils::IsActionBoxEnabled())
|
| + << "Without this, extension->script_badge() would return NULL.";
|
| +}
|
|
|
| ScriptBadgeController::~ScriptBadgeController() {}
|
|
|
| @@ -41,7 +45,7 @@ ScriptBadgeController::GetCurrentActions() {
|
| it != service->extensions()->end(); ++it) {
|
| const Extension* extension = *it;
|
| if (extensions_executing_scripts_.count(extension->id()))
|
| - current_actions->push_back(extension->GetScriptBadge());
|
| + current_actions->push_back(extension->script_badge());
|
| }
|
| return current_actions.Pass();
|
| }
|
|
|