Extension Toolbar redesign, part 1 (overflow)

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 2b2d50f583508076255437dee2332c6c4dc20af9..fca62d6f42e81d0b96a1e428801ed370e0193c64 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -47,6 +47,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/common/feature_switch.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -529,6 +530,9 @@ void WrenchMenuModel::Build(bool is_new_menu) {
     AddSeparator(ui::NORMAL_SEPARATOR);
 #endif
 
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
+    CreateExtensionToolbarOverflowMenu();
+
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
 
@@ -727,6 +731,13 @@ void WrenchMenuModel::AddGlobalErrorMenuItems() {
   }
 }
 
+void WrenchMenuModel::CreateExtensionToolbarOverflowMenu() {
+#if defined(TOOLKIT_VIEWS)
+  AddItem(IDC_EXTENSIONS_OVERFLOW_MENU, base::string16());
+  AddSeparator(ui::UPPER_SEPARATOR);

[Peter Kasting, 2014/06/30 23:36:33]

Shouldn't we only add these if the overflow menu is going to be non-empty?  Or
are there always menu items in this menu even when there are no overflowed
icons?

[Finnur, 2014/07/02 16:59:55]

This experiment is behind a flag and more is needed before it can be considered
fully implemented. I've added a TODO for this.

+#endif  // defined(TOOLKIT_VIEWS)
+}
+
 void WrenchMenuModel::CreateCutCopyPasteMenu(bool new_menu) {
   AddSeparator(new_menu ? ui::LOWER_SEPARATOR : ui::NORMAL_SEPARATOR);