Restructure the wrench menu into an action based order

chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc

Index: chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
index 3f3d042f79fa3d449ef71ca793ae357be0ab84da..ae94d2c5d5cdd31a56ab81bc4ed9b406429465e4 100644
--- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
@@ -20,11 +20,6 @@ BookmarkSubMenuModel::BookmarkSubMenuModel(
 BookmarkSubMenuModel::~BookmarkSubMenuModel() {}
 
 void BookmarkSubMenuModel::Build(Browser* browser) {
-  AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
-  AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
-#if !defined(OS_CHROMEOS)
-  AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL);
-#endif
   bool is_submenu_visible =
       delegate()->IsCommandIdVisible(IDC_BOOKMARK_PAGE) ||
       delegate()->IsCommandIdVisible(IDC_BOOKMARK_ALL_TABS);
@@ -32,17 +27,19 @@ void BookmarkSubMenuModel::Build(Browser* browser) {
   is_submenu_visible |=
       delegate()->IsCommandIdVisible(IDC_PIN_TO_START_SCREEN);
 #endif
-  if (is_submenu_visible) {
-    AddSeparator(ui::NORMAL_SEPARATOR);
 
+  if (is_submenu_visible) {
     AddItemWithStringId(IDC_BOOKMARK_PAGE, IDS_BOOKMARK_THIS_PAGE);
     AddItemWithStringId(IDC_BOOKMARK_ALL_TABS, IDS_BOOKMARK_OPEN_PAGES);
 
 #if defined(OS_WIN)
     AddItemWithStringId(IDC_PIN_TO_START_SCREEN, IDS_PIN_TO_START_SCREEN);
 #endif
+    AddSeparator(ui::NORMAL_SEPARATOR);
   }
-#if defined(OS_MACOSX)
-  AddSeparator(ui::NORMAL_SEPARATOR);
+  AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
+  AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+#if !defined(OS_CHROMEOS)
+  AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL);
 #endif
 }