| Index: chrome/browser/bookmarks/bookmark_node_data.cc
|
| ===================================================================
|
| --- chrome/browser/bookmarks/bookmark_node_data.cc (revision 71050)
|
| +++ chrome/browser/bookmarks/bookmark_node_data.cc (working copy)
|
| @@ -81,13 +81,13 @@
|
|
|
| #if defined(TOOLKIT_VIEWS)
|
| // static
|
| -OSExchangeData::CustomFormat BookmarkNodeData::GetBookmarkCustomFormat() {
|
| - static OSExchangeData::CustomFormat format;
|
| +ui::OSExchangeData::CustomFormat BookmarkNodeData::GetBookmarkCustomFormat() {
|
| + static ui::OSExchangeData::CustomFormat format;
|
| static bool format_valid = false;
|
|
|
| if (!format_valid) {
|
| format_valid = true;
|
| - format = OSExchangeData::RegisterCustomFormat(
|
| + format = ui::OSExchangeData::RegisterCustomFormat(
|
| BookmarkNodeData::kClipboardFormatString);
|
| }
|
| return format;
|
| @@ -217,7 +217,7 @@
|
| #endif // !defined(OS_MACOSX)
|
|
|
| #if defined(TOOLKIT_VIEWS)
|
| -void BookmarkNodeData::Write(Profile* profile, OSExchangeData* data) const {
|
| +void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
|
| DCHECK(data);
|
|
|
| // If there is only one element and it is a URL, write the URL to the
|
| @@ -236,7 +236,7 @@
|
| data->SetPickledData(GetBookmarkCustomFormat(), data_pickle);
|
| }
|
|
|
| -bool BookmarkNodeData::Read(const OSExchangeData& data) {
|
| +bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
|
| elements.clear();
|
|
|
| profile_path_.clear();
|
|
|