| Index: chrome/common/extensions/extension_switch_utils.cc
|
| diff --git a/chrome/common/extensions/extension_switch_utils.cc b/chrome/common/extensions/extension_switch_utils.cc
|
| index 8b41231917b059c0acb68c24542dda745838f411..76e8ed4ac76991137b407e8a0ee24342f3d1d618 100644
|
| --- a/chrome/common/extensions/extension_switch_utils.cc
|
| +++ b/chrome/common/extensions/extension_switch_utils.cc
|
| @@ -22,9 +22,10 @@ bool IsEasyOffStoreInstallEnabled() {
|
| #endif
|
| }
|
|
|
| -bool IsActionBoxEnabled() {
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableActionBox);
|
| +bool IsExtensionsInActionBoxEnabled() {
|
| + CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + return command_line->HasSwitch(switches::kEnableActionBox) &&
|
| + command_line->HasSwitch(switches::kEnableExtensionsInActionBox);
|
| }
|
|
|
| bool AreScriptBadgesEnabled() {
|
|
|