1 files changed, 20 insertions, 9 deletions
diff --git a/chromium/ui/views/controls/menu/menu_delegate.cc b/chromium/ui/views/controls/menu/menu_delegate.cc
index 90ab5cbe1b2..6778545f415 100644
--- a/chromium/ui/views/controls/menu/menu_delegate.cc
+++ b/chromium/ui/views/controls/menu/menu_delegate.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 
+#include "ui/events/event.h"
+#include "ui/views/controls/menu/menu_config.h"
+
 namespace views {
 
 MenuDelegate::~MenuDelegate() {}
@@ -13,14 +15,19 @@ bool MenuDelegate::IsItemChecked(int id) const {
   return false;
 }
 
-string16 MenuDelegate::GetLabel(int id) const {
-  return string16();
+base::string16 MenuDelegate::GetLabel(int id) const {
+  return base::string16();
 }
 
-const gfx::Font* MenuDelegate::GetLabelFont(int id) const {
+const gfx::FontList* MenuDelegate::GetLabelFontList(int id) const {
   return NULL;
 }
 
+bool MenuDelegate::GetShouldUseDisabledEmphasizedForegroundColor(
+    int command_id) const {
+  return false;
+}
+
 bool MenuDelegate::GetBackgroundColor(int command_id,
                                       bool is_hovered,
                                       SkColor* override_color) const {
@@ -33,12 +40,12 @@ bool MenuDelegate::GetForegroundColor(int command_id,
   return false;
 }
 
-string16 MenuDelegate::GetTooltipText(int id,
+base::string16 MenuDelegate::GetTooltipText(int id,
                                       const gfx::Point& screen_loc) const {
-  return string16();
+  return base::string16();
 }
 
-bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) {
+bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) const {
   return false;
 }
 
@@ -57,7 +64,11 @@ bool MenuDelegate::IsCommandEnabled(int id) const {
   return true;
 }
 
-bool MenuDelegate::GetContextualLabel(int id, string16* out) const {
+bool MenuDelegate::IsCommandVisible(int id) const {
+  return true;
+}
+
+bool MenuDelegate::GetContextualLabel(int id, base::string16* out) const {
   return false;
 }
 
@@ -126,7 +137,7 @@ int MenuDelegate::GetDragOperations(MenuItemView* sender) {
 
 MenuItemView* MenuDelegate::GetSiblingMenu(MenuItemView* menu,
                                            const gfx::Point& screen_point,
-                                           MenuItemView::AnchorPosition* anchor,
+                                           MenuAnchorPosition* anchor,
                                            bool* has_mnemonics,
                                            MenuButton** button) {
   return NULL;