Index: chrome/browser/ui/views/bookmark_menu_controller_views.h |
=================================================================== |
--- chrome/browser/ui/views/bookmark_menu_controller_views.h (revision 71050) |
+++ chrome/browser/ui/views/bookmark_menu_controller_views.h (working copy) |
@@ -16,22 +16,25 @@ |
#include "views/controls/menu/menu_delegate.h" |
#include "views/controls/menu/menu_item_view.h" |
+class BookmarkBarView; |
+class BookmarkContextMenu; |
+class BookmarkNode; |
+class Browser; |
+class PageNavigator; |
+class Profile; |
+ |
namespace gfx { |
class Rect; |
} // namespace gfx |
+namespace ui { |
+class OSExchangeData; |
+} // namespace ui |
+ |
namespace views { |
class MenuButton; |
} // namespace views |
-class BookmarkBarView; |
-class BookmarkContextMenu; |
-class BookmarkNode; |
-class Browser; |
-class OSExchangeData; |
-class PageNavigator; |
-class Profile; |
- |
// BookmarkMenuController is responsible for showing a menu of bookmarks, |
// each item in the menu represents a bookmark. |
// BookmarkMenuController deletes itself as necessary, although the menu can |
@@ -87,9 +90,10 @@ |
virtual bool GetDropFormats( |
views::MenuItemView* menu, |
int* formats, |
- std::set<OSExchangeData::CustomFormat>* custom_formats); |
+ std::set<ui::OSExchangeData::CustomFormat>* custom_formats); |
virtual bool AreDropTypesRequired(views::MenuItemView* menu); |
- virtual bool CanDrop(views::MenuItemView* menu, const OSExchangeData& data); |
+ virtual bool CanDrop(views::MenuItemView* menu, |
+ const ui::OSExchangeData& data); |
virtual int GetDropOperation(views::MenuItemView* item, |
const views::DropTargetEvent& event, |
DropPosition* position); |
@@ -102,7 +106,8 @@ |
bool is_mouse_gesture); |
virtual void DropMenuClosed(views::MenuItemView* menu); |
virtual bool CanDrag(views::MenuItemView* menu); |
- virtual void WriteDragData(views::MenuItemView* sender, OSExchangeData* data); |
+ virtual void WriteDragData(views::MenuItemView* sender, |
+ ui::OSExchangeData* data); |
virtual int GetDragOperations(views::MenuItemView* sender); |
virtual views::MenuItemView* GetSiblingMenu( |
views::MenuItemView* menu, |