Fixes new wrench related problems on views:

chrome/browser/views/toolbar_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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 212 matching lines @@
 void ToolbarView::Update(TabContents* tab, bool should_restore_state) {
   if (location_bar_)
     location_bar_->Update(should_restore_state ? tab : NULL);
 
   if (browser_actions_)
     browser_actions_->RefreshBrowserActionViews();
 }
 
 void ToolbarView::SetAppMenuModel(menus::SimpleMenuModel* model) {
   app_menu_model_.reset(model);
-  app_menu_menu_.reset(new views::Menu2(app_menu_model_.get()));
+  if (!WrenchMenuModel::IsEnabled())
+    app_menu_menu_.reset(new views::Menu2(app_menu_model_.get()));
 }
 
 void ToolbarView::SetToolbarFocusAndFocusLocationBar(int view_storage_id) {
   SetToolbarFocus(view_storage_id, location_bar_);
 }
 
 void ToolbarView::SetToolbarFocusAndFocusPageMenu(int view_storage_id) {
   if (page_menu_)
     SetToolbarFocus(view_storage_id, page_menu_);
   else
@@ skipping 575 matching lines @@
   }
 #endif
 
   // Tell the menu button to activate, opening its pop-up menu.
   menu_button->Activate();
 
 #if defined(OS_WIN)
   SetToolbarFocus(NULL, menu_button);
 #endif
 }