summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 03:58:11 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 03:58:11 +0000
commit8cd89cca063a2087ff9cf2ed89989c5a0024da09 (patch)
tree01fa2dff81256910b82d15186367c5d2efa5e185 /chrome
parenta99f0ce8b398b3f0b159834eb0068dc7597edc68 (diff)
downloadchromium_src-8cd89cca063a2087ff9cf2ed89989c5a0024da09.zip
chromium_src-8cd89cca063a2087ff9cf2ed89989c5a0024da09.tar.gz
chromium_src-8cd89cca063a2087ff9cf2ed89989c5a0024da09.tar.bz2
Splits the menu classes into individual files in anticipation of
porting them. BUG=none TEST=make sure to thorougly test bookmark menus on windows. Review URL: http://codereview.chromium.org/173091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/bookmark_context_menu.h6
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc2
-rw-r--r--chrome/browser/views/bookmark_bar_view_test.cc4
-rw-r--r--chrome/browser/views/bookmark_context_menu.cc1
-rw-r--r--chrome/browser/views/bookmark_context_menu.h2
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc1
-rw-r--r--chrome/browser/views/bookmark_menu_controller_views.h7
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc2
8 files changed, 17 insertions, 8 deletions
diff --git a/chrome/browser/gtk/bookmark_context_menu.h b/chrome/browser/gtk/bookmark_context_menu.h
index 940dd2b..755a01c 100644
--- a/chrome/browser/gtk/bookmark_context_menu.h
+++ b/chrome/browser/gtk/bookmark_context_menu.h
@@ -13,8 +13,8 @@
#include "chrome/browser/bookmarks/bookmark_model_observer.h"
// TODO(port): Port this file.
-#if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
-#include "views/controls/menu/chrome_menu.h"
+#if defined(TOOLKIT_VIEWS)
+#include "views/controls/menu/menu_delegate.h"
#elif defined(OS_LINUX)
#include "chrome/browser/gtk/menu_gtk.h"
#else
@@ -29,7 +29,7 @@ class Profile;
// bookmark bar, items on the bookmark bar, submenus of the bookmark bar and
// the bookmark manager.
class BookmarkContextMenu : public BookmarkModelObserver,
-#if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
public views::MenuDelegate
#elif defined(OS_LINUX)
public MenuGtk::Delegate
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 4afe926..56386fc 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -37,7 +37,7 @@
#include "grit/theme_resources.h"
#include "skia/ext/skia_utils.h"
#include "views/controls/button/menu_button.h"
-#include "views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/menu_item_view.h"
#include "views/drag_utils.h"
#include "views/view_constants.h"
#include "views/widget/tooltip_manager.h"
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 2ed558f..3d683f6 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -14,7 +14,9 @@
#include "chrome/test/testing_profile.h"
#include "chrome/test/interactive_ui/view_event_test_base.h"
#include "views/controls/button/text_button.h"
-#include "views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/menu_controller.h"
+#include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/submenu_view.h"
#include "views/window/window.h"
namespace {
diff --git a/chrome/browser/views/bookmark_context_menu.cc b/chrome/browser/views/bookmark_context_menu.cc
index c8f829c..9e5a769 100644
--- a/chrome/browser/views/bookmark_context_menu.cc
+++ b/chrome/browser/views/bookmark_context_menu.cc
@@ -7,6 +7,7 @@
#include "app/l10n_util.h"
#include "chrome/browser/profile.h"
#include "grit/generated_resources.h"
+#include "views/controls/menu/menu_item_view.h"
////////////////////////////////////////////////////////////////////////////////
// BookmarkContextMenu, public:
diff --git a/chrome/browser/views/bookmark_context_menu.h b/chrome/browser/views/bookmark_context_menu.h
index 96304d4..d541bdb 100644
--- a/chrome/browser/views/bookmark_context_menu.h
+++ b/chrome/browser/views/bookmark_context_menu.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_
#include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
-#include "views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/menu_delegate.h"
class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate,
public views::MenuDelegate {
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index a34a310..193cd4b 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -31,6 +31,7 @@
#include "skia/ext/skia_utils.h"
#include "views/grid_layout.h"
#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/menu_item_view.h"
#include "views/controls/label.h"
#include "views/controls/single_split_view.h"
#include "views/standard_layout.h"
diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h
index e9bd5d3..319c96d 100644
--- a/chrome/browser/views/bookmark_menu_controller_views.h
+++ b/chrome/browser/views/bookmark_menu_controller_views.h
@@ -11,7 +11,12 @@
#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
#include "chrome/browser/bookmarks/bookmark_drag_data.h"
#include "chrome/browser/views/bookmark_context_menu.h"
-#include "views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/menu_delegate.h"
+#include "views/controls/menu/menu_item_view.h"
+
+namespace gfx {
+class Rect;
+}
class BookmarkContextMenu;
class BookmarkNode;
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index bf58923..565bf02 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -31,7 +31,7 @@
#include "chrome/browser/bookmarks/bookmark_editor.h"
#include "chrome/browser/bookmarks/bookmark_manager.h"
#include "chrome/browser/tab_contents/constrained_window.h"
-#include "views/controls/menu/chrome_menu.h"
+#include "views/controls/menu/menu_item_view.h"
#include "views/controls/single_split_view.h"
#endif