Make a shared app menu model and update win and mac to use it. Remove the NSM...

chrome/browser/autocomplete/autocomplete_edit_view_win.h

 // Copyright (c) 2006-2008 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_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
 #include <atlmisc.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl.
 
 #include "app/gfx/font.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/toolbar_model.h"
 #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;
 class Profile;
 class TabContents;
 namespace views {
 class View;
-class Menu2;
 }
 
 class AutocompleteEditController;
 class AutocompleteEditModel;
 class AutocompleteEditView;
 class AutocompletePopupView;
 
 // Provides the implementation of an edit control with a drop-down
 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
 // This file implements the edit box and management for the popup.
@@ skipping 446 matching lines @@
   mutable ScopedComPtr<IAccessible> autocomplete_accessibility_;
 
   // We explicitly retain a handle to this library so it never gets unloaded out
   // from underneath us.
   HMODULE riched20dll_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_