Removed separator in bookmarks sub-menu if there are no bookmarks or folders to display (only fix...

chrome/browser/ui/toolbar/wrench_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/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 182 matching lines @@
 }
 
 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_TITLE);
 #endif
-#if defined(OS_MACOSX) || defined(TOOLKIT_VIEWS)
-  AddSeparator();
-#else
+#if !defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)

[Roger Tawa OOO till Jul 10th, 2011/07/21 20:41:48]

I suggested the wrong thing to you earlier, sorry.  Instead of reversing the
condition, keep the #ifdef defined(OS_MACOSX) part, since your change in the
other file only affects Views.

   // TODO: add submenu for bookmarks themselves, restore separator.
 #endif
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // WrenchMenuModel
 
 WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
                                  Browser* browser)
@@ skipping 336 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }