Fixes new wrench related problems on views:

chrome/browser/wrench_menu_model.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/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "app/l10n_util.h"
@@ skipping 145 matching lines @@
   DCHECK_EQ(NotificationType::ZOOM_LEVEL_CHANGED, type.value);
   UpdateZoomControls();
 }
 
 void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
   AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
 
   AddSeparator();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   edit_menu_item_model_.reset(new menus::ButtonMenuItemModel(IDS_EDIT, this));
   edit_menu_item_model_->AddItemWithStringId(IDC_CUT, IDS_CUT);
   edit_menu_item_model_->AddItemWithStringId(IDC_COPY, IDS_COPY);
   edit_menu_item_model_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
   AddButtonItem(0, edit_menu_item_model_.get());
 #else
   // TODO(port): Move to the above.
   CreateCutCopyPaste();
 #endif
 
   AddSeparator();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   zoom_menu_item_model_.reset(
       new menus::ButtonMenuItemModel(IDS_ZOOM_MENU, this));
   zoom_menu_item_model_->AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS2);
   zoom_menu_item_model_->AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS2);
   zoom_menu_item_model_->AddSpace();
   zoom_menu_item_model_->AddItemWithImage(
       IDC_FULLSCREEN, IDR_FULLSCREEN_MENU_BUTTON);
   AddButtonItem(0, zoom_menu_item_model_.get());
 #else
   // TODO(port): Move to the above.
@@ skipping 97 matching lines @@
   }
   return l10n_util::GetStringFUTF16(
       IDS_ABOUT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
 
 bool WrenchMenuModel::IsDynamicItem(int index) const {
   int command_id = GetCommandIdAt(index);
   return command_id == IDC_SYNC_BOOKMARKS ||
          command_id == IDC_ABOUT;
 }