summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/browser_actions_container.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 19:00:48 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 19:00:48 +0000
commit41d2e4af3daa1d1ca8f8cbfa6788604a4c9913b9 (patch)
treefa82bb18c231744e72ffd334217be1e256c9e849 /chrome/browser/ui/views/browser_actions_container.h
parent356a50ef463bb52fdd9d5700ca11b4b83d4809bc (diff)
downloadchromium_src-41d2e4af3daa1d1ca8f8cbfa6788604a4c9913b9.zip
chromium_src-41d2e4af3daa1d1ca8f8cbfa6788604a4c9913b9.tar.gz
chromium_src-41d2e4af3daa1d1ca8f8cbfa6788604a4c9913b9.tar.bz2
Move OSExchangeData from src/app to src/ui/base/dragdrop
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6200005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/browser_actions_container.h')
-rw-r--r--chrome/browser/ui/views/browser_actions_container.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index 235bede..4bce4b5 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -323,9 +323,9 @@ class BrowserActionsContainer
views::View* parent,
views::View* child);
virtual bool GetDropFormats(
- int* formats, std::set<OSExchangeData::CustomFormat>* custom_formats);
+ int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats);
virtual bool AreDropTypesRequired();
- virtual bool CanDrop(const OSExchangeData& data);
+ virtual bool CanDrop(const ui::OSExchangeData& data);
virtual void OnDragEntered(const views::DropTargetEvent& event);
virtual int OnDragUpdated(const views::DropTargetEvent& event);
virtual void OnDragExited();
@@ -339,7 +339,7 @@ class BrowserActionsContainer
// Overridden from views::DragController:
virtual void WriteDragData(View* sender,
const gfx::Point& press_pt,
- OSExchangeData* data);
+ ui::OSExchangeData* data);
virtual int GetDragOperations(View* sender, const gfx::Point& p);
virtual bool CanStartDrag(View* sender,
const gfx::Point& press_pt,