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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 
 #include "apps/app_load_service.h"
 #include "apps/saved_files_service.h"
 #include "base/auto_reset.h"
 #include "base/base64.h"
@@ skipping 382 matching lines @@
       break;
   }
   extension_data->SetString("blacklistText", blacklist_text);
 
   // Force unpacked extensions to show at the top.
   if (Manifest::IsUnpackedLocation(extension->location()))
     extension_data->SetInteger("order", 1);
   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);
   }
 
   // Add views
   base::ListValue* views = new base::ListValue;
   for (std::vector<ExtensionPage>::const_iterator iter = pages.begin();
        iter != pages.end(); ++iter) {
     base::DictionaryValue* view_value = new base::DictionaryValue;
     if (iter->url.scheme() == kExtensionScheme) {
       // No leading slash.
@@ skipping 1112 matching lines @@
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
         base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true);  // Be noisy.
   }
   requirements_checker_.reset();
 }
 
 }  // namespace extensions