[Extensions] Fix hiding browser actions without the toolbar redesign

chrome/browser/extensions/extension_context_menu_model.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/extensions/extension_context_menu_model.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 238 matching lines @@
             ->OnClicked(extension);
       }
       break;
     }
     case CONFIGURE:
       DCHECK(OptionsPageInfo::HasOptionsPage(extension));
       ExtensionTabUtil::OpenOptionsPage(extension, browser_);
       break;
     case TOGGLE_VISIBILITY: {
       bool currently_visible = button_visibility_ == VISIBLE;
+      // Without the toolbar redesign turned on, action visibility refers to
+      // any action presence in the toolbar, independent of whether the action
+      // is visible or overflowed. So any action present is considered visible.
+      if (!FeatureSwitch::extension_action_redesign()->IsEnabled())
+        currently_visible = true;
       ToolbarActionsModel::Get(browser_->profile())
           ->SetActionVisibility(extension->id(), !currently_visible);
       break;
     }
     case UNINSTALL: {
       UninstallDialogHelper::UninstallExtension(browser_, extension);
       break;
     }
     case MANAGE: {
       chrome::ShowExtensions(browser_, extension->id());
@@ skipping 98 matching lines @@
   extension_items_->AppendExtensionItems(MenuItem::ExtensionKey(extension_id_),
                                          base::string16(), &index,
                                          true);  // is_action_menu
 }
 
 content::WebContents* ExtensionContextMenuModel::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 }  // namespace extensions