Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: chrome/browser/bookmarks/bookmark_drag_data.h

Issue 155456: Try the original CL "Always persist bookmark IDs" again with the fix to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_ 6 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 std::vector<Element> children; 55 std::vector<Element> children;
56 56
57 private: 57 private:
58 friend struct BookmarkDragData; 58 friend struct BookmarkDragData;
59 59
60 // For reading/writing this Element. 60 // For reading/writing this Element.
61 void WriteToPickle(Pickle* pickle) const; 61 void WriteToPickle(Pickle* pickle) const;
62 bool ReadFromPickle(Pickle* pickle, void** iterator); 62 bool ReadFromPickle(Pickle* pickle, void** iterator);
63 63
64 // ID of the node. 64 // ID of the node.
65 int id_; 65 int64 id_;
66 }; 66 };
67 67
68 BookmarkDragData() { } 68 BookmarkDragData() { }
69 69
70 // Created a BookmarkDragData populated from the arguments. 70 // Created a BookmarkDragData populated from the arguments.
71 explicit BookmarkDragData(const BookmarkNode* node); 71 explicit BookmarkDragData(const BookmarkNode* node);
72 explicit BookmarkDragData(const std::vector<const BookmarkNode*>& nodes); 72 explicit BookmarkDragData(const std::vector<const BookmarkNode*>& nodes);
73 73
74 #if defined(TOOLKIT_VIEWS) 74 #if defined(TOOLKIT_VIEWS)
75 // Writes elements to data. If there is only one element and it is a URL 75 // Writes elements to data. If there is only one element and it is a URL
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 private: 117 private:
118 // Path of the profile we originated from. 118 // Path of the profile we originated from.
119 #if defined(WCHAR_T_IS_UTF16) 119 #if defined(WCHAR_T_IS_UTF16)
120 std::wstring profile_path_; 120 std::wstring profile_path_;
121 #elif defined(WCHAR_T_IS_UTF32) 121 #elif defined(WCHAR_T_IS_UTF32)
122 std::string profile_path_; 122 std::string profile_path_;
123 #endif 123 #endif
124 }; 124 };
125 125
126 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_ 126 #endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_codec_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_drag_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698