[Extensions Toolbar] Have all extensions in the toolbar show a context menu

extensions/common/extension.cc

Index: extensions/common/extension.cc
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index b721406701d0732e6fd83eec12798d41024cb329..7c202734d3573ddfdc51d144fd07ad0dc1cb23e3 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -24,6 +24,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler.h"
@@ -275,8 +276,11 @@ bool Extension::ShowConfigureContextMenus() const {
   // options for component extension button but now there is no component
   // extension with options. All other menu items like uninstall have

[Finnur, 2015/02/16 11:39:51]

This comment is now out of date (no component extension with options). But see
below (to the left).

[Devlin, 2015/02/17 18:40:41]

Acknowledged.

   // no sense for component extensions.
-  return location() != Manifest::COMPONENT &&
-         location() != Manifest::EXTERNAL_COMPONENT;
+  // We change this rule if the redesign is enabled, because it's just weird to
+  // have a random button that has no context menu when the rest do.
+  return (location() != Manifest::COMPONENT &&
+          location() != Manifest::EXTERNAL_COMPONENT) ||
+         FeatureSwitch::extension_action_redesign()->IsEnabled();
 }
 
 bool Extension::OverlapsWithOrigin(const GURL& origin) const {