| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ | 5 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ |
| 6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ | 6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ |
| 7 | 7 |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 // A new bookmark should be created if the user accepts the edit. | 65 // A new bookmark should be created if the user accepts the edit. |
| 66 // |existing_node| is null in this case. | 66 // |existing_node| is null in this case. |
| 67 NEW_URL, | 67 NEW_URL, |
| 68 | 68 |
| 69 // A new folder bookmark should be created if the user accepts the edit. | 69 // A new folder bookmark should be created if the user accepts the edit. |
| 70 // The contents of the folder should be that of |urls|. | 70 // The contents of the folder should be that of |urls|. |
| 71 // |existing_node| is null in this case. | 71 // |existing_node| is null in this case. |
| 72 NEW_FOLDER | 72 NEW_FOLDER |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 EditDetails(const EditDetails& other); |
| 75 ~EditDetails(); | 76 ~EditDetails(); |
| 76 | 77 |
| 77 // See description of enum value for details. | 78 // See description of enum value for details. |
| 78 const Type type; | 79 const Type type; |
| 79 | 80 |
| 80 // If type == EXISTING_NODE this gives the existing node. | 81 // If type == EXISTING_NODE this gives the existing node. |
| 81 const bookmarks::BookmarkNode* existing_node; | 82 const bookmarks::BookmarkNode* existing_node; |
| 82 | 83 |
| 83 // If type == NEW_URL or type == NEW_FOLDER this gives the initial parent | 84 // If type == NEW_URL or type == NEW_FOLDER this gives the initial parent |
| 84 // node to place the new node in. | 85 // node to place the new node in. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // created. Otherwise the return value is identically |node|. | 126 // created. Otherwise the return value is identically |node|. |
| 126 static const bookmarks::BookmarkNode* ApplyEditsWithPossibleFolderChange( | 127 static const bookmarks::BookmarkNode* ApplyEditsWithPossibleFolderChange( |
| 127 bookmarks::BookmarkModel* model, | 128 bookmarks::BookmarkModel* model, |
| 128 const bookmarks::BookmarkNode* new_parent, | 129 const bookmarks::BookmarkNode* new_parent, |
| 129 const EditDetails& details, | 130 const EditDetails& details, |
| 130 const base::string16& new_title, | 131 const base::string16& new_title, |
| 131 const GURL& new_url); | 132 const GURL& new_url); |
| 132 }; | 133 }; |
| 133 | 134 |
| 134 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ | 135 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_EDITOR_H_ |
| OLD | NEW |