Fix for broken build

BUG=none
TEST=none

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

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

3 files changed, 9 insertions, 9 deletions

diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 497f076..60589d2 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -310,7 +310,7 @@ void NativeTextfieldViews::HandleWillLoseFocus() {
 }
 
 /////////////////////////////////////////////////////////////////
-// NativeTextfieldViews, menus::SimpleMenuModel::Delegate overrides:
+// NativeTextfieldViews, ui::SimpleMenuModel::Delegate overrides:
 
 bool NativeTextfieldViews::IsCommandIdChecked(int command_id) const {
   return true;
@@ -338,7 +338,7 @@ bool NativeTextfieldViews::IsCommandIdEnabled(int command_id) const {
 }
 
 bool NativeTextfieldViews::GetAcceleratorForCommandId(int command_id,
-    menus::Accelerator* accelerator) {
+    ui::Accelerator* accelerator) {
   return false;
 }
 
@@ -772,7 +772,7 @@ void NativeTextfieldViews::PropagateTextChange() {
 void NativeTextfieldViews::InitContextMenuIfRequired() {
   if (context_menu_menu_.get())
     return;
-  context_menu_contents_.reset(new menus::SimpleMenuModel(this));
+  context_menu_contents_.reset(new ui::SimpleMenuModel(this));
   context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
   context_menu_contents_->AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_->AddItemWithStringId(IDS_APP_PASTE, IDS_APP_PASTE);
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 983e63b..0344c85 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -6,10 +6,10 @@
 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #pragma once
 
-#include "app/menus/simple_menu_model.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "gfx/font.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "views/border.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/view.h"
@@ -37,7 +37,7 @@ class TextfieldViewsModel;
 class NativeTextfieldViews : public views::View,
                              public views::ContextMenuController,
                              public NativeTextfieldWrapper,
-                             public menus::SimpleMenuModel::Delegate {
+                             public ui::SimpleMenuModel::Delegate {
  public:
   explicit NativeTextfieldViews(Textfield* parent);
   ~NativeTextfieldViews();
@@ -87,11 +87,11 @@ class NativeTextfieldViews : public views::View,
   virtual void HandleDidGainFocus();
   virtual void HandleWillLoseFocus();
 
-  // menus::SimpleMenuModel::Delegate overrides
+  // ui::SimpleMenuModel::Delegate overrides
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
-                                          menus::Accelerator* accelerator);
+                                          ui::Accelerator* accelerator);
   virtual void ExecuteCommand(int command_id);
 
   // class name of internal
@@ -191,7 +191,7 @@ class NativeTextfieldViews : public views::View,
   ScopedRunnableMethodFactory<NativeTextfieldViews> cursor_timer_;
 
   // Context menu and its content list for the textfield.
-  scoped_ptr<menus::SimpleMenuModel> context_menu_contents_;
+  scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<Menu2> context_menu_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 9a7f2d8..9e946ab 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -397,7 +397,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_FocusTraversalTest) {
 }
 
 void VerifyTextfieldContextMenuContents(bool textfield_has_selection,
-    menus::MenuModel* menu_model) {
+    ui::MenuModel* menu_model) {
   EXPECT_TRUE(menu_model->IsEnabledAt(4 /* Separator */));
   EXPECT_TRUE(menu_model->IsEnabledAt(5 /* SELECT ALL */));
   EXPECT_EQ(textfield_has_selection, menu_model->IsEnabledAt(0 /* CUT */));