Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/tab_contents/tab_contents_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_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "views/widget/widget_win.h"
 
+class RenderViewContextMenuWin;
 class SadTabView;
 struct WebDropData;
 class WebDropTarget;
 
-
 // Windows-specific implementation of the TabContentsView. It is a HWND that
 // contains all of the contents of the tab and associated child views.
 class TabContentsViewWin : public TabContentsView,
                            public views::WidgetWin {
  public:
   // The corresponding TabContents is passed in the constructor, and manages our
   // lifetime. This doesn't need to be the case, but is this way currently
   // because that's what was easiest when they were split.
   explicit TabContentsViewWin(TabContents* tab_contents);
   virtual ~TabContentsViewWin();
@@ skipping 66 matching lines @@
   // Used to render the sad tab. This will be non-NULL only when the sad tab is
   // visible.
   scoped_ptr<SadTabView> sad_tab_;
 
   // Whether to ignore the next CHAR keyboard event.
   bool ignore_next_char_event_;
 
   // The id used in the ViewStorage to store the last focused view.
   int last_focused_view_storage_id_;
 
+  // The context menu. Callbacks are asynchronous so we need to keep it around.
+  scoped_ptr<RenderViewContextMenuWin> context_menu_;
+
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_