summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/bookmarks/bookmark_drag_data.cc22
-rw-r--r--chrome/browser/browser.scons1
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj4
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc12
-rw-r--r--chrome/common/temp_scaffolding_stubs.h6
5 files changed, 32 insertions, 13 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index 73ac107..1194751 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -4,19 +4,30 @@
#include "chrome/browser/bookmarks/bookmark_drag_data.h"
+#include "base/basictypes.h"
#include "base/pickle.h"
#include "base/string_util.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/profile.h"
+
+// TODO(port): Port this file.
+#if defined(OS_WIN)
#include "chrome/common/os_exchange_data.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+#if defined(OS_WIN)
static CLIPFORMAT clipboard_format = 0;
+#endif
static void RegisterFormat() {
+#if defined(OS_WIN)
if (clipboard_format == 0) {
clipboard_format = RegisterClipboardFormat(L"chrome/x-bookmark-entries");
DCHECK(clipboard_format);
}
+#endif
}
BookmarkDragData::Element::Element(BookmarkNode* node)
@@ -99,7 +110,12 @@ void BookmarkDragData::Write(Profile* profile, OSExchangeData* data) const {
for (size_t i = 0; i < elements.size(); ++i)
elements[i].WriteToPickle(&data_pickle);
+#if defined(OS_WIN)
data->SetPickledData(clipboard_format, data_pickle);
+#else
+ // TODO(port): Clipboard integration.
+ NOTIMPLEMENTED();
+#endif
}
bool BookmarkDragData::Read(const OSExchangeData& data) {
@@ -109,6 +125,7 @@ bool BookmarkDragData::Read(const OSExchangeData& data) {
profile_path_.clear();
+#if defined(OS_WIN)
if (data.HasFormat(clipboard_format)) {
Pickle drag_data_pickle;
if (data.GetPickledData(clipboard_format, &drag_data_pickle)) {
@@ -136,6 +153,11 @@ bool BookmarkDragData::Read(const OSExchangeData& data) {
elements.push_back(element);
}
}
+#else
+ // TODO(port): Clipboard integration.
+ NOTIMPLEMENTED();
+#endif
+
return is_valid();
}
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index c39fd5d..030a3fa 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -671,7 +671,6 @@ if not env.Bit('windows'):
'automation/automation_provider_list.cc',
'automation/ui_controls.cc',
'bookmarks/bookmark_context_menu.cc',
- 'bookmarks/bookmark_drag_data.cc',
'bookmarks/bookmark_drop_info.cc',
'browser_accessibility.cc',
'browser_accessibility_manager.cc',
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index eb0192d..d6ac699 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -620,6 +620,7 @@
F47CA1280F44AE0E00FFFAFB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7B004E0E9D5464009A6919 /* libnet.a */; };
F47CA1290F44AE2800FFFAFB /* libglue.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850180F2FC82E009F6555 /* libglue.a */; };
F47CA12A0F44AE3500FFFAFB /* libwtf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 826850240F2FC82E009F6555 /* libwtf.a */; };
+ F58A0570E84AA76543E0C5CA /* bookmark_drag_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = E7FDE61828F151056D975855 /* bookmark_drag_data.cc */; };
F775995035B63E51251B0922 /* ssl_error_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = 26D97CE692D919FEB1521E43 /* ssl_error_info.cc */; };
F958714A0B14B028646CF087 /* save_package.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9DA0E9D48CE009A6919 /* save_package.cc */; };
/* End PBXBuildFile section */
@@ -2823,6 +2824,7 @@
E4F324420EE5CE94002533CE /* extension_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extension_unittest.cc; sourceTree = "<group>"; };
E4F324780EE5D17E002533CE /* referrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = referrer.h; sourceTree = "<group>"; };
E4F324790EE5D17E002533CE /* referrer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = referrer.cc; sourceTree = "<group>"; };
+ E7FDE61828F151056D975855 /* bookmark_drag_data.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bookmark_drag_data.cc; path = browser/bookmarks/bookmark_drag_data.cc; sourceTree = SOURCE_ROOT; };
E81681ADC802675FE949BC63 /* child_thread.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = child_thread.cc; sourceTree = "<group>"; };
EA72C084DB3FC0FC595E525E /* template_url_model.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = template_url_model.cc; sourceTree = "<group>"; };
EA72CF50C0AB4492A644C703 /* url_fetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = url_fetcher.h; sourceTree = "<group>"; };
@@ -3179,6 +3181,7 @@
4F3E216FC08B4749FC8C2ED5 /* autocomplete.cc */,
0114EE7E1097BDFBF94057E6 /* search_provider.cc */,
A2FC5EE73E0DE8BF6C1C4C0F /* bookmark_utils.cc */,
+ E7FDE61828F151056D975855 /* bookmark_drag_data.cc */,
);
sourceTree = "<group>";
};
@@ -5456,6 +5459,7 @@
82BB330A0F44B57C00761F43 /* base_view.mm in Sources */,
4D7BFAEE0E9D49E5009A6919 /* bloom_filter.cc in Sources */,
E45075B20F1505C0003BE099 /* bookmark_codec.cc in Sources */,
+ F58A0570E84AA76543E0C5CA /* bookmark_drag_data.cc in Sources */,
E40CC5F20F2E34EE00708647 /* bookmark_folder_tree_model.cc in Sources */,
E45075B40F1505C9003BE099 /* bookmark_html_writer.cc in Sources */,
81E4783DE6F497B9BCC5B9F6 /* bookmark_model.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 5019c3c..84a0307 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -16,7 +16,6 @@
#include "base/singleton.h"
#include "base/task.h"
#include "chrome/browser/autocomplete/history_url_provider.h"
-#include "chrome/browser/bookmarks/bookmark_drag_data.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/cache_manager_host.h"
@@ -355,17 +354,6 @@ void DebuggerShell::ProcessCommand(const std::wstring& data) {
}
#endif // !CHROME_DEBUGGER_DISABLED
-bool BookmarkDragData::IsFromProfile(Profile* profile) const {
- NOTIMPLEMENTED();
- return false;
-}
-
-std::vector<BookmarkNode*> BookmarkDragData::GetNodes(Profile* profile) const {
- std::vector<BookmarkNode*> nodes;
- NOTIMPLEMENTED();
- return nodes;
-}
-
ScopableCPRequest::~ScopableCPRequest() {
NOTIMPLEMENTED();
}
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 987c25c..3013b70 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -688,4 +688,10 @@ class HistoryTabUI {
}
};
+class OSExchangeData {
+ public:
+ void SetString(const std::wstring& data) { NOTIMPLEMENTED(); }
+ void SetURL(const GURL& url, const std::wstring& title) { NOTIMPLEMENTED(); }
+};
+
#endif // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_
generated by cgit v1.1 at 2025-02-19 21:10:08 +0000