Some cleanup in view menu delegate

chrome/browser/views/toolbar_view.cc

 // 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.
 
 #include "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 444 matching lines @@
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
     return gfx::Size(0, normal_background.height());
   }
 
   int locbar_height = location_bar_->GetPreferredSize().height();
   return gfx::Size(0, locbar_height + 2 * kControlVertOffsetLocationOnly);
 }
 
-void BrowserToolbarView::RunPageMenu(const CPoint& pt, HWND hwnd) {
+void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
 
   Menu menu(this, anchor, hwnd);
   menu.AppendMenuItemWithLabel(IDC_CREATE_SHORTCUTS,
       l10n_util::GetString(IDS_CREATE_SHORTCUTS));
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_CUT, l10n_util::GetString(IDS_CUT));
   menu.AppendMenuItemWithLabel(IDC_COPY, l10n_util::GetString(IDS_COPY));
@@ skipping 43 matching lines @@
           l10n_util::GetString(developer_menu_materials[i].menu_label_id));
     } else {
       developer_menu->AppendSeparator();
     }
   }
 
   menu.AppendSeparator();
 
   menu.AppendMenuItemWithLabel(IDC_REPORT_BUG,
                                l10n_util::GetString(IDS_REPORT_BUG));
-  menu.RunMenuAt(pt.x, pt.y);
+  menu.RunMenuAt(pt.x(), pt.y());
 }
 
-void BrowserToolbarView::RunAppMenu(const CPoint& pt, HWND hwnd) {
+void BrowserToolbarView::RunAppMenu(const gfx::Point& pt, HWND hwnd) {
   Menu::AnchorPoint anchor = Menu::TOPRIGHT;
   if (UILayoutIsRightToLeft())
     anchor = Menu::TOPLEFT;
 
   Menu menu(this, anchor, hwnd);
   menu.AppendMenuItemWithLabel(IDC_NEW_TAB, l10n_util::GetString(IDS_NEW_TAB));
   menu.AppendMenuItemWithLabel(IDC_NEW_WINDOW,
                                l10n_util::GetString(IDS_NEW_WINDOW));
   menu.AppendMenuItemWithLabel(IDC_NEW_INCOGNITO_WINDOW,
                                l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW));
@@ skipping 23 matching lines @@
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_OPTIONS, l10n_util::GetStringF(IDS_OPTIONS,
                                l10n_util::GetString(IDS_PRODUCT_NAME)));
   menu.AppendMenuItemWithLabel(IDC_ABOUT, l10n_util::GetStringF(IDS_ABOUT,
                                l10n_util::GetString(IDS_PRODUCT_NAME)));
   menu.AppendMenuItemWithLabel(IDC_HELP_PAGE,
                                l10n_util::GetString(IDS_HELP_PAGE));
   menu.AppendSeparator();
   menu.AppendMenuItemWithLabel(IDC_EXIT, l10n_util::GetString(IDS_EXIT));
 
-  menu.RunMenuAt(pt.x, pt.y);
+  menu.RunMenuAt(pt.x(), pt.y());
 
   // Menu is going away, so set the profiles menu pointer to NULL.
   profiles_menu_ = NULL;
 }
 
 bool BrowserToolbarView::IsItemChecked(int id) const {
   if (!profile_)
     return false;
   if (id == IDC_SHOW_BOOKMARK_BAR)
     return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   return EncodingMenuControllerDelegate::IsItemChecked(id);
 }
 
-void BrowserToolbarView::RunMenu(views::View* source, const CPoint& pt,
+void BrowserToolbarView::RunMenu(views::View* source, const gfx::Point& pt,
                                  HWND hwnd) {
   switch (source->GetID()) {
     case VIEW_ID_PAGE_MENU:
       RunPageMenu(pt, hwnd);
       break;
     case VIEW_ID_APP_MENU:
       RunAppMenu(pt, hwnd);
       break;
     default:
       NOTREACHED() << "Invalid source menu.";
@@ skipping 151 matching lines @@
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }