summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/menu_controller.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 03:20:55 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 03:20:55 +0000
commit2b9277dc6dd0ed8426078b3afb48cd1383df8fbe (patch)
tree6cf736441cc877fe4fff0968bcb2f669e441f025 /views/controls/menu/menu_controller.h
parent31cc2fdd5f43c4c6a0c0ebe0679458ecb3ba1593 (diff)
downloadchromium_src-2b9277dc6dd0ed8426078b3afb48cd1383df8fbe.zip
chromium_src-2b9277dc6dd0ed8426078b3afb48cd1383df8fbe.tar.gz
chromium_src-2b9277dc6dd0ed8426078b3afb48cd1383df8fbe.tar.bz2
Wires up drag and drop for bookmark menus and cleans up a couple of
minor painting issues. BUG=none TEST=none Review URL: http://codereview.chromium.org/199050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_controller.h')
-rw-r--r--views/controls/menu/menu_controller.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index ac84af5..eb6e87e 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -8,6 +8,7 @@
#include "build/build_config.h"
#include <list>
+#include <set>
#include <vector>
#include "base/message_loop.h"
@@ -79,6 +80,11 @@ class MenuController : public MessageLoopForUI::Dispatcher {
void OnMouseReleased(SubmenuView* source, const MouseEvent& event);
void OnMouseMoved(SubmenuView* source, const MouseEvent& event);
void OnMouseEntered(SubmenuView* source, const MouseEvent& event);
+ bool GetDropFormats(
+ SubmenuView* source,
+ int* formats,
+ std::set<OSExchangeData::CustomFormat>* custom_formats);
+ bool AreDropTypesRequired(SubmenuView* source);
bool CanDrop(SubmenuView* source, const OSExchangeData& data);
void OnDragEntered(SubmenuView* source, const DropTargetEvent& event);
int OnDragUpdated(SubmenuView* source, const DropTargetEvent& event);