[Extensions Toolbar] Don't show the "show button" for hidden browser actions

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index f3993b5c273d1a9e6fb9139cd5181ddd5711d663..a62d206aee7cdecef398f8c61674f8f13d69d5c1 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -400,7 +400,11 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
   else
     extension_data->SetInteger("order", 2);
 
-  if (!ExtensionActionAPI::GetBrowserActionVisibility(prefs, extension->id())) {
+  // Don't show the "show button" for the browser action if the toolbar
+  // redesign is enabled, because "hidden" buttons are now just hidden in the
+  // wrench menu.
+  if (!ExtensionActionAPI::GetBrowserActionVisibility(prefs, extension->id()) &&
+      !FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     extension_data->SetBoolean("enable_show_button", true);
   }