Index: trunk/src/chrome/browser/ui/views/extensions/browser_action_drag_data.cc |
=================================================================== |
--- trunk/src/chrome/browser/ui/views/extensions/browser_action_drag_data.cc (revision 285300) |
+++ trunk/src/chrome/browser/ui/views/extensions/browser_action_drag_data.cc (working copy) |
@@ -10,13 +10,9 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "ui/base/clipboard/clipboard.h" |
-namespace { |
+const char* BrowserActionDragData::kClipboardFormatString = |
+ "chromium/x-browser-actions"; |
-// The MIME type for the clipboard format for BrowserActionDragData. |
-const char kClipboardFormatString[] = "chromium/x-browser-actions"; |
- |
-} |
- |
BrowserActionDragData::BrowserActionDragData() |
: profile_(NULL), index_(static_cast<size_t>(-1)) { |
} |
@@ -26,23 +22,7 @@ |
: profile_(NULL), id_(id), index_(index) { |
} |
-bool BrowserActionDragData::GetDropFormats( |
- std::set<ui::OSExchangeData::CustomFormat>* custom_formats) { |
- custom_formats->insert(GetBrowserActionCustomFormat()); |
- return true; |
-} |
- |
-bool BrowserActionDragData::AreDropTypesRequired() { |
- return true; |
-} |
- |
-bool BrowserActionDragData::CanDrop(const ui::OSExchangeData& data, |
- const Profile* profile) { |
- BrowserActionDragData drop_data; |
- return drop_data.Read(data) && drop_data.IsFromProfile(profile); |
-} |
- |
-bool BrowserActionDragData::IsFromProfile(const Profile* profile) const { |
+bool BrowserActionDragData::IsFromProfile(Profile* profile) const { |
return profile_ == profile; |
} |