summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_editor_view.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 21:06:57 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 21:06:57 +0000
commit6277eaded1883e224015efcc5456e3c265e8b633 (patch)
tree2c36feca37d7a6132fa14556fb146307285c007d /chrome/browser/views/bookmark_editor_view.h
parentaa1dddf057a4295ee1c09c0566eb98ecd8de8fb8 (diff)
downloadchromium_src-6277eaded1883e224015efcc5456e3c265e8b633.zip
chromium_src-6277eaded1883e224015efcc5456e3c265e8b633.tar.gz
chromium_src-6277eaded1883e224015efcc5456e3c265e8b633.tar.bz2
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
Diffstat (limited to 'chrome/browser/views/bookmark_editor_view.h')
-rw-r--r--chrome/browser/views/bookmark_editor_view.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 4ca3fde..754e5f8 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -40,7 +40,7 @@ class BookmarkEditorView : public BookmarkEditor,
public views::DialogDelegate,
public views::TextField::Controller,
public views::ContextMenuController,
- public Menu::Delegate,
+ public views::Menu::Delegate,
public BookmarkModelObserver {
FRIEND_TEST(BookmarkEditorViewTest, ChangeParent);
FRIEND_TEST(BookmarkEditorViewTest, ChangeParentAndURL);
@@ -243,7 +243,7 @@ class BookmarkEditorView : public BookmarkEditor,
BookmarkNode* node_;
// The context menu.
- scoped_ptr<Menu> context_menu_;
+ scoped_ptr<views::Menu> context_menu_;
// Mode used to create nodes from.
BookmarkModel* bb_model_;