Make a shared app menu model and update win and mac to use it. Remove the NSMenu from Toolbar.xib.

BUG=22646
TEST=the app menu works as it used to.
Review URL: http://codereview.chromium.org/482006

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

11 files changed, 257 insertions, 136 deletions

diff --git a/chrome/browser/app_menu_model.cc b/chrome/browser/app_menu_model.cc
new file mode 100644
index 0000000..5cd69f3
--- /dev/null
+++ b/chrome/browser/app_menu_model.cc
@@ -0,0 +1,123 @@
+// Copyright (c) 2009 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/app_menu_model.h"
+
+#include "app/l10n_util.h"
+#include "base/command_line.h"
+#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/defaults.h"
+#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/sync_ui_util.h"
+#include "chrome/common/chrome_switches.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+
+AppMenuModel::AppMenuModel(menus::SimpleMenuModel::Delegate* delegate,
+                           Browser* browser)
+    : menus::SimpleMenuModel(delegate),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          profiles_helper_(new GetProfilesHelper(this))),
+      browser_(browser) {
+  Build();
+}
+
+AppMenuModel::~AppMenuModel() {
+  profiles_helper_->OnDelegateDeleted();
+}
+
+void AppMenuModel::Build() {
+  AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
+  AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
+  AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
+  // Enumerate profiles asynchronously and then create the parent menu item.
+  // We will create the child menu items for this once the asynchronous call is
+  // done.  See OnGetProfilesDone().
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableUserDataDirProfiles)) {
+    if (!profiles_menu_contents_.get()) {
+      profiles_helper_->GetProfiles(NULL);
+      profiles_menu_contents_.reset(new menus::SimpleMenuModel(delegate()));
+    }
+    AddSubMenuWithStringId(IDS_PROFILE_MENU, profiles_menu_contents_.get());
+  }
+
+  AddSeparator();
+  AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
+  AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
+  AddSeparator();
+  AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
+  AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+  AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
+
+  // Create the manage extensions menu item.
+  AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
+
+  AddSeparator();
+  if (ProfileSyncService::IsSyncEnabled()) {
+    string16 label;
+    string16 link;
+    // TODO(akalin): use sync_ui_util::GetStatus instead.
+    sync_ui_util::MessageType type = sync_ui_util::GetStatusLabels(
+        browser_->profile()->GetOriginalProfile()->GetProfileSyncService(),
+        &label, &link);
+    if (type == sync_ui_util::SYNCED) {
+      label = l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL);
+    } else if (type == sync_ui_util::SYNC_ERROR) {
+      label = l10n_util::GetStringUTF16(
+          IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL);
+    } else {
+      label = l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
+    }
+    AddItem(IDC_SYNC_BOOKMARKS, label);
+    AddSeparator();
+  }
+#if defined(OS_MACOSX)
+  AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC);
+#else
+  AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+#endif
+  if (browser_defaults::kShowAboutMenuItem) {
+    AddItem(IDC_ABOUT,
+            l10n_util::GetStringFUTF16(
+                IDS_ABOUT,
+                l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  }
+  AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
+  if (browser_defaults::kShowExitMenuItem) {
+    AddSeparator();
+    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
+  }
+}
+
+void AppMenuModel::OnGetProfilesDone(
+    const std::vector<std::wstring>& profiles) {
+  // Nothing to do if the menu has gone away.
+  if (!profiles_menu_contents_.get())
+    return;
+
+  // Store the latest list of profiles in the browser.
+  browser_->set_user_data_dir_profiles(profiles);
+
+  // Add direct submenu items for profiles.
+  std::vector<std::wstring>::const_iterator iter = profiles.begin();
+  for (int i = IDC_NEW_WINDOW_PROFILE_0;
+       i <= IDC_NEW_WINDOW_PROFILE_LAST && iter != profiles.end();
+       ++i, ++iter)
+    profiles_menu_contents_->AddItem(i, WideToUTF16Hack(*iter));
+
+  // If there are more profiles then show "Other" link.
+  if (iter != profiles.end()) {
+    profiles_menu_contents_->AddSeparator();
+    profiles_menu_contents_->AddItemWithStringId(IDC_SELECT_PROFILE,
+                                                 IDS_SELECT_PROFILE);
+  }
+
+  // Always show a link to select a new profile.
+  profiles_menu_contents_->AddSeparator();
+  profiles_menu_contents_->AddItemWithStringId(
+      IDC_NEW_PROFILE,
+      IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY);
+}
diff --git a/chrome/browser/app_menu_model.h b/chrome/browser/app_menu_model.h
new file mode 100644
index 0000000..086d613
--- /dev/null
+++ b/chrome/browser/app_menu_model.h
@@ -0,0 +1,44 @@
+// Copyright (c) 2009 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_APP_MENU_MODEL_H_
+#define CHROME_BROWSER_APP_MENU_MODEL_H_
+
+#include "app/menus/simple_menu_model.h"
+#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
+#include "chrome/browser/user_data_manager.h"
+
+class Browser;
+
+// A menu model that builds the contents of the app menu. This menu has only
+// one level (no submenus).
+class AppMenuModel : public menus::SimpleMenuModel,
+                     public GetProfilesHelper::Delegate {
+ public:
+  explicit AppMenuModel(menus::SimpleMenuModel::Delegate* delegate,
+                        Browser* browser);
+  virtual ~AppMenuModel();
+
+  // Overridden from GetProfilesHelper::Delegate
+  virtual void OnGetProfilesDone(
+      const std::vector<std::wstring>& profiles);
+
+ private:
+  void Build();
+
+  // The top-level model.
+  scoped_ptr<menus::SimpleMenuModel> model_;
+  // Contents of the profiles menu to populate with profile names.
+  scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_;
+
+  // Helper class to enumerate profiles information on the file thread.
+  scoped_refptr<GetProfilesHelper> profiles_helper_;
+
+  Browser* browser_;  // weak
+
+  DISALLOW_COPY_AND_ASSIGN(AppMenuModel);
+};
+
+#endif  // CHROME_BROWSER_APP_MENU_MODEL_H_
diff --git a/chrome/browser/app_menu_model_unittest.cc b/chrome/browser/app_menu_model_unittest.cc
new file mode 100644
index 0000000..b354292
--- /dev/null
+++ b/chrome/browser/app_menu_model_unittest.cc
@@ -0,0 +1,52 @@
+// Copyright (c) 2009 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/app_menu_model.h"
+
+#include "base/logging.h"
+#include "chrome/test/browser_with_test_window_test.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// A menu delegate that counts the number of times certain things are called
+// to make sure things are hooked up properly.
+class Delegate : public menus::SimpleMenuModel::Delegate {
+ public:
+  Delegate() : execute_count_(0), enable_count_(0) { }
+
+  virtual bool IsCommandIdChecked(int command_id) const { return false; }
+  virtual bool IsCommandIdEnabled(int command_id) const {
+    ++enable_count_;
+    return true;
+  }
+  virtual bool GetAcceleratorForCommandId(
+      int command_id,
+      menus::Accelerator* accelerator) { return false; }
+  virtual void ExecuteCommand(int command_id) { ++execute_count_; }
+
+  int execute_count_;
+  mutable int enable_count_;
+};
+
+class AppMenuModelTest : public BrowserWithTestWindowTest {
+};
+
+TEST_F(AppMenuModelTest, Basics) {
+  Delegate delegate;
+  AppMenuModel model(&delegate, browser());
+
+  // Verify it has items. The number varies by platform, so we don't check
+  // the exact number.
+  EXPECT_GT(model.GetItemCount(), 5);
+
+  // Execute a couple of the items and make sure it gets back to our delegate.
+  model.ActivatedAt(0);
+  EXPECT_TRUE(model.IsEnabledAt(0));
+  model.ActivatedAt(3);
+  EXPECT_TRUE(model.IsEnabledAt(4));
+  EXPECT_EQ(delegate.execute_count_, 2);
+  EXPECT_EQ(delegate.enable_count_, 2);
+
+  delegate.execute_count_ = 0;
+  delegate.enable_count_ = 0;
+}
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 75c9608..c00d5f3 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -43,7 +43,6 @@
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"
-#include "views/controls/menu/menu_2.h"
 #include "views/drag_utils.h"
 #include "views/focus/focus_util_win.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
index 8da5ad1..393ef0a 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h
@@ -22,6 +22,7 @@
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/window_open_disposition.h"
+#include "views/controls/menu/menu_2.h"
 
 class AutocompletePopupModel;
 class CommandUpdater;
@@ -29,7 +30,6 @@ class Profile;
 class TabContents;
 namespace views {
 class View;
-class Menu2;
 }
 
 class AutocompleteEditController;
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h
index 676b0a8..0b96569 100644
--- a/chrome/browser/cocoa/toolbar_controller.h
+++ b/chrome/browser/cocoa/toolbar_controller.h
@@ -14,6 +14,7 @@
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/common/pref_member.h"
 
+class AppMenuModel;
 @class AutocompleteTextField;
 @class AutocompleteTextFieldEditor;
 @class BackForwardMenuController;
@@ -56,11 +57,14 @@ class ToolbarModel;
   scoped_nsobject<BrowserActionsController> browserActionsController_;
 
   // Lazily-instantiated model, controller, and delegate for the menu on the
-  // page button. If it's visible, these will be non-null, but they are not
-  // reaped when the button is hidden once it is initially shown.
+  // page and wrench buttons. The wrench menu is also called the "app menu". If
+  // it's visible, these will be non-null, but they are not reaped when the
+  // button is hidden once it is initially shown.
   scoped_ptr<PageMenuModel> pageMenuModel_;
   scoped_nsobject<MenuController> pageMenuController_;
-  scoped_ptr<ToolbarControllerInternal::MenuDelegate> pageMenuDelegate_;
+  scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
+  scoped_ptr<AppMenuModel> appMenuModel_;
+  scoped_nsobject<MenuController> appMenuController_;
 
   // Used for monitoring the optional toolbar button prefs.
   scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 937fe43..05a70b7 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -10,6 +10,7 @@
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_menu_model.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/bubble_positioner.h"
@@ -472,13 +473,18 @@ class PrefObserverBridge : public NotificationObserver {
 - (void)installPageWrenchMenus {
   if (pageMenuModel_.get())
     return;
-  pageMenuDelegate_.reset(
-      new ToolbarControllerInternal::MenuDelegate(browser_));
-  pageMenuModel_.reset(new PageMenuModel(pageMenuDelegate_.get(), browser_));
+  menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_));
+  pageMenuModel_.reset(new PageMenuModel(menuDelegate_.get(), browser_));
   pageMenuController_.reset(
       [[MenuController alloc] initWithModel:pageMenuModel_.get()
-                              useWithPopUpButtonCell:YES]);
+                     useWithPopUpButtonCell:YES]);
   [pageButton_ setAttachedMenu:[pageMenuController_ menu]];
+
+  appMenuModel_.reset(new AppMenuModel(menuDelegate_.get(), browser_));
+  appMenuController_.reset(
+      [[MenuController alloc] initWithModel:appMenuModel_.get()
+                     useWithPopUpButtonCell:YES]);
+  [wrenchButton_ setAttachedMenu:[appMenuController_ menu]];
 }
 
 // Show or hide the page and wrench buttons based on the pref.
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index e0f9142..ed99c9d 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -19,6 +19,7 @@ const bool kCanToggleSystemTitleBar = false;
 const bool kRestorePopups = true;
 const bool kShowImportOnBookmarkBar = false;
 const bool kShowExitMenuItem = false;
+const bool kShowAboutMenuItem = true;
 const bool kOSSupportsOtherBrowsers = false;
 
 #elif defined(OS_LINUX)
@@ -48,7 +49,13 @@ const SessionStartupPref::Type kDefaultSessionStartupType =
 const int kPinnedTabWidth = 56;
 const bool kRestorePopups = false;
 const bool kShowImportOnBookmarkBar = true;
+#if defined(OS_MACOSX)
+const bool kShowExitMenuItem = false;
+const bool kShowAboutMenuItem = false;
+#else
 const bool kShowExitMenuItem = true;
+const bool kShowAboutMenuItem = true;
+#endif
 const bool kOSSupportsOtherBrowsers = true;
 
 #endif
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 4df86b6..7ab5505 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -41,12 +41,15 @@ extern const bool kRestorePopups;
 extern const bool kBrowserAliveWithNoWindows;
 
 // Should a link be shown on the bookmark bar allowing the user to import
-// bookmarks.
+// bookmarks?
 extern const bool kShowImportOnBookmarkBar;
 
-// Should the exit menu be shown?
+// Should the exit menu item be shown in the toolbar menu?
 extern const bool kShowExitMenuItem;
 
+// Should the about menu item be shown in the toolbar app menu?
+extern const bool kShowAboutMenuItem;
+
 // Does the OS support other browsers? If not, operations such as default
 // browser check are not done.
 extern const bool kOSSupportsOtherBrowsers;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 6aae9df..411d1e0 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -16,7 +16,6 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/back_forward_menu_model_views.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
@@ -31,7 +30,6 @@
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/bookmark_menu_button.h"
 #include "chrome/browser/views/browser_actions_container.h"
 #include "chrome/browser/views/event_utils.h"
@@ -94,9 +92,7 @@ ToolbarView::ToolbarView(Browser* browser)
       bookmark_menu_(NULL),
       profile_(NULL),
       browser_(browser),
-      profiles_menu_contents_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          profiles_helper_(new GetProfilesHelper(this))) {
+      profiles_menu_contents_(NULL) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
@@ -113,10 +109,6 @@ ToolbarView::ToolbarView(Browser* browser)
   }
 }
 
-ToolbarView::~ToolbarView() {
-  profiles_helper_->OnDelegateDeleted();
-}
-
 void ToolbarView::Init(Profile* profile) {
   back_menu_model_.reset(new BackForwardMenuModelViews(
       browser_, BackForwardMenuModel::BACKWARD_MENU, GetWidget()));
@@ -180,39 +172,6 @@ void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ToolbarView, GetProfilesHelper::Delegate implementation:
-
-void ToolbarView::OnGetProfilesDone(
-    const std::vector<std::wstring>& profiles) {
-  // Nothing to do if the menu has gone away.
-  if (!profiles_menu_contents_.get())
-    return;
-
-  // Store the latest list of profiles in the browser.
-  browser_->set_user_data_dir_profiles(profiles);
-
-  // Add direct sub menu items for profiles.
-  std::vector<std::wstring>::const_iterator iter = profiles.begin();
-  for (int i = IDC_NEW_WINDOW_PROFILE_0;
-       (i <= IDC_NEW_WINDOW_PROFILE_LAST) && (iter != profiles.end());
-       ++i, ++iter)
-    profiles_menu_contents_->AddItem(i, WideToUTF16Hack(*iter));
-
-  // If there are more profiles then show "Other" link.
-  if (iter != profiles.end()) {
-    profiles_menu_contents_->AddSeparator();
-    profiles_menu_contents_->AddItemWithStringId(IDC_SELECT_PROFILE,
-                                                 IDS_SELECT_PROFILE);
-  }
-
-  // Always show a link to select a new profile.
-  profiles_menu_contents_->AddSeparator();
-  profiles_menu_contents_->AddItemWithStringId(
-      IDC_NEW_PROFILE,
-      IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY);
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
 TabContents* ToolbarView::GetTabContents() {
@@ -770,75 +729,9 @@ void ToolbarView::RunPageMenu(const gfx::Point& pt) {
 }
 
 void ToolbarView::RunAppMenu(const gfx::Point& pt) {
-  CreateAppMenu();
-  app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
-}
-
-void ToolbarView::CreateAppMenu() {
   // We always rebuild the app menu so that we can get the current state of
   // the sync system.
-
-  app_menu_contents_.reset(new menus::SimpleMenuModel(this));
-  app_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
-  app_menu_contents_->AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
-  app_menu_contents_->AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW,
-                                          IDS_NEW_INCOGNITO_WINDOW);
-  // Enumerate profiles asynchronously and then create the parent menu item.
-  // We will create the child menu items for this once the asynchronous call is
-  // done.  See OnGetProfilesDone().
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableUserDataDirProfiles) &&
-      !profiles_menu_contents_.get()) {
-    profiles_helper_->GetProfiles(NULL);
-    profiles_menu_contents_.reset(new menus::SimpleMenuModel(this));
-    app_menu_contents_->AddSubMenuWithStringId(IDS_PROFILE_MENU,
-                                               profiles_menu_contents_.get());
-  }
-
-  app_menu_contents_->AddSeparator();
-  app_menu_contents_->AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR,
-                                               IDS_SHOW_BOOKMARK_BAR);
-  app_menu_contents_->AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
-  app_menu_contents_->AddSeparator();
-  app_menu_contents_->AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
-  app_menu_contents_->AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER,
-                                          IDS_BOOKMARK_MANAGER);
-  app_menu_contents_->AddItemWithStringId(IDC_SHOW_DOWNLOADS,
-                                          IDS_SHOW_DOWNLOADS);
-
-  // Create the manage extensions menu item.
-  app_menu_contents_->AddItemWithStringId(IDC_MANAGE_EXTENSIONS,
-                                          IDS_SHOW_EXTENSIONS);
-
-  app_menu_contents_->AddSeparator();
-  if (ProfileSyncService::IsSyncEnabled()) {
-    string16 label;
-    string16 link;
-    // TODO(akalin): use sync_ui_util::GetStatus instead.
-    sync_ui_util::MessageType type = sync_ui_util::GetStatusLabels(
-        browser_->profile()->GetOriginalProfile()->GetProfileSyncService(),
-        &label, &link);
-    label = type == sync_ui_util::SYNCED ?
-        l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL) :
-        type == sync_ui_util::SYNC_ERROR ?
-        l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL) :
-        l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
-    app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, label);
-    app_menu_contents_->AddSeparator();
-  }
-  app_menu_contents_->AddItem(IDC_OPTIONS,
-                              l10n_util::GetStringFUTF16(
-                                  IDS_OPTIONS,
-                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-  app_menu_contents_->AddItem(IDC_ABOUT,
-                              l10n_util::GetStringFUTF16(
-                                  IDS_ABOUT,
-                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-  app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
-  if (browser_defaults::kShowExitMenuItem) {
-    app_menu_contents_->AddSeparator();
-    app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
-  }
-
-  app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
+  app_menu_model_.reset(new AppMenuModel(this, browser_));
+  app_menu_menu_.reset(new views::Menu2(app_menu_model_.get()));
+  app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index 5048fb1..22b4788 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -8,12 +8,12 @@
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
-#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/app_menu_model.h"
+#include "chrome/browser/back_forward_menu_model_views.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/page_menu_model.h"
-#include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
@@ -23,7 +23,6 @@
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
-class BackForwardMenuModelViews;
 class BrowserActionsContainer;
 class Browser;
 class Profile;
@@ -40,13 +39,12 @@ class ToolbarView : public AccessibleToolbarView,
                     public menus::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public NotificationObserver,
-                    public GetProfilesHelper::Delegate,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener,
                     public BubblePositioner {
  public:
   explicit ToolbarView(Browser* browser);
-  virtual ~ToolbarView();
+  virtual ~ToolbarView() { }
 
   // Create the contents of the Browser Toolbar
   void Init(Profile* profile);
@@ -79,9 +77,6 @@ class ToolbarView : public AccessibleToolbarView,
   // Overridden from views::MenuDelegate:
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
-  // Overridden from GetProfilesHelper::Delegate:
-  virtual void OnGetProfilesDone(const std::vector<std::wstring>& profiles);
-
   // Overridden from LocationBarView::Delegate:
   virtual TabContents* GetTabContents();
   virtual void OnInputInProgress(bool in_progress);
@@ -143,8 +138,6 @@ class ToolbarView : public AccessibleToolbarView,
   void RunPageMenu(const gfx::Point& pt);
   void RunAppMenu(const gfx::Point& pt);
 
-  void CreateAppMenu();
-
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
@@ -180,9 +173,6 @@ class ToolbarView : public AccessibleToolbarView,
   // Contents of the profiles menu to populate with profile names.
   scoped_ptr<menus::SimpleMenuModel> profiles_menu_contents_;
 
-  // Helper class to enumerate profiles information on the file thread.
-  scoped_refptr<GetProfilesHelper> profiles_helper_;
-
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
@@ -191,7 +181,7 @@ class ToolbarView : public AccessibleToolbarView,
 
   // The contents of the various menus.
   scoped_ptr<PageMenuModel> page_menu_model_;
-  scoped_ptr<menus::SimpleMenuModel> app_menu_contents_;
+  scoped_ptr<AppMenuModel> app_menu_model_;
 
   // TODO(beng): build these into MenuButton.
   scoped_ptr<views::Menu2> page_menu_menu_;