Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface.

views/controls/menu/menu_item_view.cc

 // Copyright (c) 2011 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 "views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 545 matching lines @@
   type_ = type;
   selected_ = false;
   command_ = command;
   submenu_ = NULL;
   show_mnemonics_ = false;
   // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
   SetID(kMenuItemViewID);
   has_icons_ = false;
 
   MenuDelegate* root_delegate = GetDelegate();
-  if (root_delegate)
+  if (parent && root_delegate)

[sky, 2011/05/25 15:41:12]

Yes, this is a good change. I just did one similar in
http://codereview.chromium.org/7066034/ to avoid calling through for (empty)
menu items. Just add a comment though.

[rhashimoto, 2011/05/25 16:24:37]

Done.

     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
 void MenuItemView::DropMenuClosed(bool notify_delegate) {
   DCHECK(controller_);
   DCHECK(!controller_->IsBlockingRun());
   if (MenuController::GetActiveInstance() == controller_)
     MenuController::SetActiveInstance(NULL);
   delete controller_;
   controller_ = NULL;
@@ skipping 161 matching lines @@
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views