Fixes new wrench menu on chromeos.

chrome/browser/chromeos/status/browser_status_area_view.cc

 // Copyright (c) 2010 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/chromeos/status/browser_status_area_view.h"
 
 #include "app/l10n_util.h"
+#include "app/menus/simple_menu_model.h"
 #include "app/theme_provider.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_menu_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/theme_background.h"
 #include "chrome/browser/views/toolbar_view.h"
+#include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
@@ skipping 73 matching lines @@
   menu_view_ = new StatusAreaButton(this);
   menu_view_->SetIcon(*theme->GetBitmapNamed(IDR_STATUSBAR_MENU));
   AddChildView(menu_view_);
 
   set_background(new ThemeBackground(browser_view_));
 
   app_menu_contents_.reset(CreateAppMenuModel(this));
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }
 
-AppMenuModel* BrowserStatusAreaView::CreateAppMenuModel(
+menus::SimpleMenuModel* BrowserStatusAreaView::CreateAppMenuModel(
     menus::SimpleMenuModel::Delegate* delegate) {
   Browser* browser = browser_view_->browser();
-  AppMenuModel* menu_model = new AppMenuModel(delegate, browser);
+  menus::SimpleMenuModel* menu_model;
+
+  if (WrenchMenuModel::IsEnabled())
+    menu_model = new WrenchMenuModel(delegate, browser);
+  else
+    menu_model = new AppMenuModel(delegate, browser);
 
   // Options menu always uses StatusAreaView as delegate, so
   // we can reuse it.
   if (!options_menu_contents_.get())
     options_menu_contents_.reset(new OptionsMenuModel(browser_view_));
 
-#if !defined(OS_CHROMEOS)
-  int sync_index = menu_model->GetIndexOfCommandId(IDC_SYNC_BOOKMARKS);
-  DCHECK_GE(sync_index, 0);
-  menu_model->InsertItemWithStringIdAt(
-      sync_index + 1, IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
-  menu_model->InsertSeparatorAt(sync_index + 1);
-#endif
-
   int options_index = menu_model->GetIndexOfCommandId(IDC_OPTIONS);
   DCHECK_GE(options_index, 0);
   menu_model->InsertSubMenuAt(
       options_index + 1,
       IDC_EXPERIMENTAL,
       ASCIIToUTF16("Experimental"),
       options_menu_contents_.get());
   return menu_model;
 }
 
@@ skipping 19 matching lines @@
 
 void BrowserStatusAreaView::ExecuteCommand(int command_id) {
   browser_view_->browser()->ExecuteCommand(command_id);
 }
 
 void BrowserStatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos