Revert r105450: Linux: add basic bookmark menu support.

TBR=mdm@chromium.org
Review URL: http://codereview.chromium.org/8286017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105454 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 40 insertions, 377 deletions

diff --git a/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.cc
index c8a9485..e69de29 100644
--- a/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.cc
@@ -1,173 +0,0 @@
-// 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/gtk/bookmark_sub_menu_model_gtk.h"
-
-#include "base/stl_util.h"
-#include "base/string16.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/event_disposition.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
-#include "chrome/browser/ui/gtk/menu_gtk.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-
-BookmarkNodeMenuModel::BookmarkNodeMenuModel(
-    ui::SimpleMenuModel::Delegate* delegate,
-    BookmarkModel* model,
-    const BookmarkNode* node,
-    PageNavigator* page_navigator)
-    : SimpleMenuModel(delegate),
-      model_(model),
-      node_(node),
-      page_navigator_(page_navigator) {
-  DCHECK(page_navigator_);
-}
-
-BookmarkNodeMenuModel::~BookmarkNodeMenuModel() {
-  Clear();
-}
-
-void BookmarkNodeMenuModel::Clear() {
-  SimpleMenuModel::Clear();
-  STLDeleteElements(&submenus_);
-}
-
-void BookmarkNodeMenuModel::MenuWillShow() {
-  Clear();
-  PopulateMenu();
-}
-
-void BookmarkNodeMenuModel::MenuClosed() {
-  Clear();
-}
-
-void BookmarkNodeMenuModel::ActivatedAt(int index) {
-  NavigateToMenuItem(index, CURRENT_TAB);
-}
-
-void BookmarkNodeMenuModel::ActivatedAt(int index, int event_flags) {
-  NavigateToMenuItem(index, browser::DispositionFromEventFlags(event_flags));
-}
-
-void BookmarkNodeMenuModel::PopulateMenu() {
-  DCHECK(submenus_.empty());
-  for (int i = 0; i < node_->child_count(); ++i) {
-    const BookmarkNode* child = node_->GetChild(i);
-    // Ironically the label will end up getting converted back to UTF8 later...
-    const string16 label =
-        UTF8ToUTF16(bookmark_utils::BuildMenuLabelFor(child));
-    if (child->is_folder()) {
-      // Don't pass in the delegate, if any. Bookmark submenus don't need one.
-      BookmarkNodeMenuModel* submenu =
-          new BookmarkNodeMenuModel(NULL, model_, child, page_navigator_);
-      // No command id. Nothing happens if you click on the submenu itself.
-      AddSubMenu(0, label, submenu);
-      submenus_.push_back(submenu);
-    } else {
-      // No command id. We override ActivatedAt below to handle activations.
-      AddItem(0, label);
-      const SkBitmap& node_icon = model_->GetFavicon(child);
-      if (node_icon.width() > 0)
-        SetIcon(GetItemCount() - 1, node_icon);
-      // TODO(mdm): set up an observer to watch for icon load events and set
-      // the icons in response.
-    }
-  }
-}
-
-void BookmarkNodeMenuModel::NavigateToMenuItem(
-    int index,
-    WindowOpenDisposition disposition) {
-  const BookmarkNode* node = node_->GetChild(index);
-  DCHECK(node);
-  page_navigator_->OpenURL(OpenURLParams(
-      node->url(), GURL(), disposition,
-      content::PAGE_TRANSITION_AUTO_BOOKMARK,
-      false));  // is_renderer_initiated
-}
-
-BookmarkSubMenuModel::BookmarkSubMenuModel(
-    ui::SimpleMenuModel::Delegate* delegate,
-    Browser* browser)
-    : BookmarkNodeMenuModel(delegate, NULL, NULL, browser),
-      browser_(browser),
-      fixed_items_(0),
-      menu_(NULL) {
-}
-
-BookmarkSubMenuModel::~BookmarkSubMenuModel() {
-  if (model())
-    model()->RemoveObserver(this);
-}
-
-void BookmarkSubMenuModel::BookmarkModelChanged() {
-  if (menu_)
-    menu_->Cancel();
-}
-
-void BookmarkSubMenuModel::BookmarkModelBeingDeleted(
-    BookmarkModel* model) {
-  set_model(NULL);
-  // All our submenus will still have pointers to the model, but this call
-  // should force the menu to close, which will cause them to be deleted.
-  BookmarkModelChanged();
-}
-
-void BookmarkSubMenuModel::MenuWillShow() {
-  Clear();
-  AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
-  AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
-  AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL);
-  if (!model()) {
-    set_model(browser_->profile()->GetBookmarkModel());
-    if (model())
-      model()->AddObserver(this);
-  }
-  if (!model() ||
-      (model()->bookmark_bar_node()->GetTotalNodeCount() == 0 &&
-       model()->other_node()->GetTotalNodeCount() == 0)) {
-    fixed_items_ = GetItemCount();
-    return;
-  }
-  AddSeparator();
-  fixed_items_ = GetItemCount();
-  if (!node())
-    set_node(model()->bookmark_bar_node());
-  // PopulateMenu() won't clear the items we added above.
-  PopulateMenu();
-  // TODO(mdm): add a separator and the "other bookmarks" node here.
-}
-
-void BookmarkSubMenuModel::ActivatedAt(int index) {
-  // Because this is also overridden in BookmarkNodeMenuModel which doesn't know
-  // we might be prepending items, we have to adjust the index for it.
-  if (index >= fixed_items_)
-    BookmarkNodeMenuModel::ActivatedAt(index - fixed_items_);
-  else
-    SimpleMenuModel::ActivatedAt(index);
-}
-
-void BookmarkSubMenuModel::ActivatedAt(int index, int event_flags) {
-  // Because this is also overridden in BookmarkNodeMenuModel which doesn't know
-  // we might be prepending items, we have to adjust the index for it.
-  if (index >= fixed_items_)
-    BookmarkNodeMenuModel::ActivatedAt(index - fixed_items_, event_flags);
-  else
-    SimpleMenuModel::ActivatedAt(index, event_flags);
-}
-
-bool BookmarkSubMenuModel::IsEnabledAt(int index) const {
-  // We don't want the delegate interfering with bookmark items.
-  return index >= fixed_items_ || SimpleMenuModel::IsEnabledAt(index);
-}
-
-bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
-  // We don't want the delegate interfering with bookmark items.
-  return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
-}
diff --git a/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h b/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h
index 17fa189..e69de29 100644
--- a/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h
+++ b/chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h
@@ -1,112 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_SUB_MENU_MODEL_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_SUB_MENU_MODEL_GTK_H_
-#pragma once
-
-#include <vector>
-
-#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "webkit/glue/window_open_disposition.h"
-
-class Browser;
-class BookmarkModel;
-class BookmarkNode;
-class MenuGtk;  // See below for why we need this.
-class PageNavigator;
-
-// BookmarkNodeMenuModel builds a SimpleMenuModel on demand when the menu is
-// shown, and automatically destroys child models when the menu is closed.
-class BookmarkNodeMenuModel : public ui::SimpleMenuModel {
- public:
-  BookmarkNodeMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                        BookmarkModel* model,
-                        const BookmarkNode* node,
-                        PageNavigator* page_navigator);
-  virtual ~BookmarkNodeMenuModel();
-
-  // From SimpleMenuModel. Takes care of deleting submenus.
-  // Note that this is not virtual. That's OK for our use.
-  void Clear();
-
-  // From MenuModel via SimpleMenuModel.
-  virtual void MenuWillShow() OVERRIDE;
-  virtual void MenuClosed() OVERRIDE;
-  virtual void ActivatedAt(int index) OVERRIDE;
-  virtual void ActivatedAt(int index, int event_flags) OVERRIDE;
-
- protected:
-  // Adds all bookmark items to the model. Does not clear the model first.
-  void PopulateMenu();
-
-  BookmarkModel* model() const { return model_; }
-  void set_model(BookmarkModel* model) { model_ = model; }
-
-  const BookmarkNode* node() const { return node_; }
-  void set_node(const BookmarkNode* node) { node_ = node; }
-
- private:
-  // Uses the page navigator to open the bookmark at the given index.
-  void NavigateToMenuItem(int index, WindowOpenDisposition disposition);
-
-  // The bookmark model whose bookmarks we will show. Note that in the top-level
-  // bookmark menu, this may be null. (It is set only when the menu is shown.)
-  BookmarkModel* model_;
-
-  // The bookmark node for the folder that this model will show. Note that in
-  // the top-level bookmark menu, this may be null, as above.
-  const BookmarkNode* node_;
-
-  // The page navigator used to open bookmarks in ActivatedAt().
-  PageNavigator* page_navigator_;
-
-  // A list of the submenus we own and will need to delete.
-  std::vector<BookmarkNodeMenuModel*> submenus_;
-
-  DISALLOW_COPY_AND_ASSIGN(BookmarkNodeMenuModel);
-};
-
-// This is the top-level bookmark menu model. It handles prepending a few fixed
-// items before the bookmarks. Child menus are all plain BookmarkNodeMenuModels.
-// This class also handles watching the bookmark model and forcing the menu to
-// close if it changes while the menu is open.
-class BookmarkSubMenuModel : public BookmarkNodeMenuModel,
-                             public BaseBookmarkModelObserver {
- public:
-  BookmarkSubMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                       Browser* browser);
-
-  virtual ~BookmarkSubMenuModel();
-
-  // See below; this is used to allow closing the menu when bookmarks change.
-  void SetMenuGtk(MenuGtk* menu) { menu_ = menu; }
-
-  // From BaseBookmarkModelObserver.
-  virtual void BookmarkModelChanged() OVERRIDE;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
-
-  // From MenuModel via BookmarkNodeMenuModel, SimpleMenuModel.
-  virtual void MenuWillShow() OVERRIDE;
-  virtual void ActivatedAt(int index) OVERRIDE;
-  virtual void ActivatedAt(int index, int event_flags) OVERRIDE;
-  virtual bool IsEnabledAt(int index) const OVERRIDE;
-  virtual bool IsVisibleAt(int index) const OVERRIDE;
-
- private:
-  Browser* browser_;
-
-  // The number of fixed items shown before the bookmarks.
-  int fixed_items_;
-
-  // We need to be able to call Cancel() on the menu when bookmarks change. This
-  // is a bit of an abstraction violation but it could be converted to an
-  // interface with just a Cancel() method if necessary.
-  MenuGtk* menu_;
-
-  DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
-};
-
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_SUB_MENU_MODEL_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index b489136..44028f2 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -27,6 +27,9 @@
 
 namespace {
 
+// TODO(estade): It might be a good idea to vary this by locale.
+const int kMaxChars = 50;
+
 void SetImageMenuItem(GtkWidget* menu_item,
                       const BookmarkNode* node,
                       BookmarkModel* model) {
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index bcd220a..28b99fd 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -223,9 +223,6 @@ void BrowserToolbarGtk::Init(GtkWindow* top_level_window) {
   gtk_box_pack_start(GTK_BOX(toolbar_), wrench_box, FALSE, FALSE, 4);
 
   wrench_menu_.reset(new MenuGtk(this, wrench_menu_model_.get()));
-  // The bookmark menu model needs to be able to force the wrench menu to close.
-  wrench_menu_model_->bookmark_sub_menu_model()->SetMenuGtk(wrench_menu_.get());
-
   registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
       Source<HostZoomMap>(profile->GetHostZoomMap()));
 
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
index fbb4f92..e69de29 100644
--- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc
@@ -1,36 +0,0 @@
-// 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 "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.
-// For the time being on GTK systems, we have a dedicated bookmark menu model in
-// chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.cc instead.
-
-// Note that although this file's header is included on GTK systems, this
-// source file is not compiled there. (The header just includes the GTK one.)
-
-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
-#if defined(OS_MACOSX)
-  AddSeparator();
-#endif
-}
diff --git a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
index 9e97ddb..e69de29 100644
--- a/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/bookmark_sub_menu_model.h
@@ -1,39 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_TOOLBAR_BOOKMARK_SUB_MENU_MODEL_H_
-#define CHROME_BROWSER_UI_TOOLBAR_BOOKMARK_SUB_MENU_MODEL_H_
-#pragma once
-
-// 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.
-// For the time being on GTK systems, we have a dedicated bookmark menu model in
-// chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h instead.
-
-#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
-
-#include "chrome/browser/ui/gtk/bookmark_sub_menu_model_gtk.h"
-
-#else  // defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
-
-#include "ui/base/models/simple_menu_model.h"
-
-class Browser;
-
-class BookmarkSubMenuModel : public ui::SimpleMenuModel {
- public:
-  BookmarkSubMenuModel(ui::SimpleMenuModel::Delegate* delegate,
-                       Browser* browser);
-  virtual ~BookmarkSubMenuModel();
-
- private:
-  void Build(Browser* browser);
-
-  DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
-};
-
-#endif  // defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
-
-#endif  // CHROME_BROWSER_UI_TOOLBAR_BOOKMARK_SUB_MENU_MODEL_H_
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 3d62499..92c8862 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -194,6 +194,31 @@ void ToolsMenuModel::Build(Browser* browser) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// BookmarkSubMenuModel
+
+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
+#if defined(OS_MACOSX)
+  AddSeparator();
+#else
+  // TODO: add submenu for bookmarks themselves, restore separator.
+#endif
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
 // WrenchMenuModel
 
 WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h
index 1b5cf6a..1446e67 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.h
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.h
@@ -9,7 +9,6 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
-#include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/models/accelerator.h"
@@ -71,6 +70,18 @@ class ToolsMenuModel : public ui::SimpleMenuModel {
   DISALLOW_COPY_AND_ASSIGN(ToolsMenuModel);
 };
 
+class BookmarkSubMenuModel : public ui::SimpleMenuModel {
+ public:
+  BookmarkSubMenuModel(ui::SimpleMenuModel::Delegate* delegate,
+                       Browser* browser);
+  virtual ~BookmarkSubMenuModel();
+
+ private:
+  void Build(Browser* browser);
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkSubMenuModel);
+};
+
 // A menu model that builds the contents of the wrench menu.
 class WrenchMenuModel : public ui::SimpleMenuModel,
                         public ui::SimpleMenuModel::Delegate,
@@ -116,10 +127,6 @@ class WrenchMenuModel : public ui::SimpleMenuModel,
   // Getters.
   Browser* browser() const { return browser_; }
 
-  BookmarkSubMenuModel* bookmark_sub_menu_model() const {
-    return bookmark_sub_menu_model_.get();
-  }
-
   // Calculates |zoom_label_| in response to a zoom change.
   void UpdateZoomControls();
 
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
index c58907d..9ee2737 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
@@ -149,8 +149,6 @@ TEST_F(WrenchMenuModelTest, Basics) {
   EXPECT_GT(bookmarksModelIndex, -1);
   ui::MenuModel* bookmarksModel = model.GetSubmenuModelAt(bookmarksModelIndex);
   EXPECT_TRUE(bookmarksModel);
-  // The bookmarks model may be empty until we tell it we're going to show it.
-  bookmarksModel->MenuWillShow();
   EXPECT_GT(bookmarksModel->GetItemCount(), 1);
   bookmarksModel->ActivatedAt(1);
   EXPECT_TRUE(bookmarksModel->IsEnabledAt(1));
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8a5f5f4..7f97936 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2885,8 +2885,6 @@
         'browser/ui/gtk/bookmarks/bookmark_tree_model.h',
         'browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc',
         'browser/ui/gtk/bookmarks/bookmark_utils_gtk.h',
-        'browser/ui/gtk/bookmark_sub_menu_model_gtk.cc',
-        'browser/ui/gtk/bookmark_sub_menu_model_gtk.h',
         'browser/ui/gtk/browser_actions_toolbar_gtk.cc',
         'browser/ui/gtk/browser_actions_toolbar_gtk.h',
         'browser/ui/gtk/browser_titlebar.cc',
@@ -3182,8 +3180,6 @@
         'browser/ui/tabs/tab_resources.h',
         'browser/ui/toolbar/back_forward_menu_model.cc',
         'browser/ui/toolbar/back_forward_menu_model.h',
-        'browser/ui/toolbar/bookmark_sub_menu_model.cc',
-        'browser/ui/toolbar/bookmark_sub_menu_model.h',
         'browser/ui/toolbar/encoding_menu_controller.cc',
         'browser/ui/toolbar/encoding_menu_controller.h',
         'browser/ui/toolbar/toolbar_model.cc',
@@ -4928,9 +4924,6 @@
                 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
                 ['exclude', '^browser/ui/panels/panel_browser_view.h'],
               ],
-              'sources!': [
-                'browser/ui/toolbar/bookmark_sub_menu_model.cc',
-              ],
             }],
             # Touch build only
             ['OS=="linux" and toolkit_views==1 and touchui==1', {