| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #ifdef CHROME_PERSONALIZATION | 5 #ifdef CHROME_PERSONALIZATION |
| 6 | 6 |
| 7 #include "chrome/test/live_sync/bookmark_model_verifier.h" | 7 #include "chrome/test/live_sync/bookmark_model_verifier.h" |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 #include <stack> | 10 #include <stack> |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 Move(model, parent->GetChild(index), parent, child_count-index); | 230 Move(model, parent->GetChild(index), parent, child_count-index); |
| 231 } | 231 } |
| 232 } | 232 } |
| 233 | 233 |
| 234 const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model, | 234 const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model, |
| 235 const BookmarkNode* node, | 235 const BookmarkNode* node, |
| 236 const GURL& new_url) { | 236 const GURL& new_url) { |
| 237 const BookmarkNode* v_node = NULL; | 237 const BookmarkNode* v_node = NULL; |
| 238 FindNodeInVerifier(model, node, &v_node); | 238 FindNodeInVerifier(model, node, &v_node); |
| 239 const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange( | 239 const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange( |
| 240 model, node->GetParent(), node, node->GetTitle(), new_url, NULL); | 240 model, node->GetParent(), BookmarkEditor::EditDetails(node), |
| 241 node->GetTitle(), new_url, NULL); |
| 241 bookmark_utils::ApplyEditsWithNoGroupChange(verifier_, v_node->GetParent(), | 242 bookmark_utils::ApplyEditsWithNoGroupChange(verifier_, v_node->GetParent(), |
| 242 v_node, v_node->GetTitle(), new_url, NULL); | 243 BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url, NULL); |
| 243 return result; | 244 return result; |
| 244 } | 245 } |
| 245 | 246 |
| 246 #endif // CHROME_PERSONALIZATION | 247 #endif // CHROME_PERSONALIZATION |
| OLD | NEW |