Refactors menus so that I can create a MenuGtk implementation, and moves it into

the namespace views.

BUG=none
TEST=make sure I haven't broken any menus. This impacts all menus in
  Chrome, except bookmark ones.

Review URL: http://codereview.chromium.org/113410

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16100 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
index 6faac2d..6e45ec8 100644
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ b/chrome/browser/encoding_menu_controller_delegate.cc
@@ -53,7 +53,7 @@ void EncodingMenuControllerDelegate::ExecuteCommand(int id) {
 }
 
 void EncodingMenuControllerDelegate::BuildEncodingMenu(
-    Profile* profile, Menu* encoding_menu) {
+    Profile* profile, views::Menu* encoding_menu) {
   typedef EncodingMenuController::EncodingMenuItemList EncodingMenuItemList;
   EncodingMenuItemList menuItems;
   EncodingMenuController controller;
@@ -62,7 +62,7 @@ void EncodingMenuControllerDelegate::BuildEncodingMenu(
   for (EncodingMenuItemList::iterator it = menuItems.begin();
        it != menuItems.end();
        ++it) {
-    Menu::MenuItemType type = Menu::RADIO;
+    views::Menu::MenuItemType type = views::Menu::RADIO;
     int id = it->first;
     std::wstring &localized_title = it->second;
 
@@ -70,7 +70,7 @@ void EncodingMenuControllerDelegate::BuildEncodingMenu(
       encoding_menu->AppendSeparator();
     } else {
       if (id == IDC_ENCODING_AUTO_DETECT) {
-        type = Menu::CHECKBOX;
+        type = views::Menu::CHECKBOX;
       }
 
       encoding_menu->AppendMenuItem(id, localized_title, type);