Restructure the wrench menu into an action based order

chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc

 // Copyright (c) 2011 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/toolbar/bookmark_sub_menu_model.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/grit/generated_resources.h"
 
 // For views and cocoa, we have complex delegate systems to handle
 // injecting the bookmarks to the bookmark submenu. This is done to support
 // advanced interactions with the menu contents, like right click context menus.
 
 BookmarkSubMenuModel::BookmarkSubMenuModel(
     ui::SimpleMenuModel::Delegate* delegate, Browser* browser)
     : SimpleMenuModel(delegate) {
   Build(browser);
 }
 
 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);
 #if defined(OS_WIN)
   is_submenu_visible |=
       delegate()->IsCommandIdVisible(IDC_PIN_TO_START_SCREEN);
 #endif
+
   if (is_submenu_visible) {
-    AddSeparator(ui::NORMAL_SEPARATOR);
-
     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
 }