Converts some uses of native_view to native_window. This is necessitated...

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2009 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 <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 234 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, Menu::BaseControllerDelegate overrides:
 
 bool ToolbarView::GetAcceleratorInfo(int id, views::Accelerator* accel) {
   return GetWidget()->GetAccelerator(id, accel);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::MenuDelegate implementation:
 
-void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt,
-                          gfx::NativeView parent) {
+void ToolbarView::RunMenu(views::View* source, const gfx::Point& pt) {
   switch (source->GetID()) {
     case VIEW_ID_PAGE_MENU:
-      RunPageMenu(pt, parent);
+      RunPageMenu(pt);
       break;
     case VIEW_ID_APP_MENU:
-      RunAppMenu(pt, parent);
+      RunAppMenu(pt);
       break;
     default:
       NOTREACHED() << "Invalid source menu.";
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, GetProfilesHelper::Delegate implementation:
 
 void ToolbarView::OnGetProfilesDone(
@@ skipping 717 matching lines @@
     page_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_PAGE));
   if (UILayoutIsRightToLeft())
     app_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_CHROME_RTL));
   else
     app_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_CHROME));
 
   if (bookmark_menu_ != NULL)
     bookmark_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_BOOKMARK));
 }
 
-void ToolbarView::RunPageMenu(const gfx::Point& pt, gfx::NativeView parent) {
+void ToolbarView::RunPageMenu(const gfx::Point& pt) {
   CreatePageMenu();
   page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
-void ToolbarView::RunAppMenu(const gfx::Point& pt, gfx::NativeView parent) {
+void ToolbarView::RunAppMenu(const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 void ToolbarView::CreatePageMenu() {
   if (page_menu_contents_.get())
     return;
 
   page_menu_contents_.reset(new views::SimpleMenuModel(this));
   page_menu_contents_->AddItemWithStringId(IDC_CREATE_SHORTCUTS,
@@ skipping 135 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }