| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | |
| 5 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 4 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
| 6 | 5 |
| 7 #include <stack> | 6 #include <stack> |
| 8 #include <vector> | 7 #include <vector> |
| 9 | 8 |
| 10 #include "base/string16.h" | 9 #include "base/string16.h" |
| 11 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 14 #include "chrome/browser/browser_thread.h" | 14 #include "chrome/browser/browser_thread.h" |
| 15 #include "chrome/browser/favicon_service.h" | 15 #include "chrome/browser/favicon_service.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/sync/profile_sync_service.h" | 17 #include "chrome/browser/sync/profile_sync_service.h" |
| 18 #include "gfx/codec/png_codec.h" | 18 #include "gfx/codec/png_codec.h" |
| 19 #include "third_party/skia/include/core/SkBitmap.h" | 19 #include "third_party/skia/include/core/SkBitmap.h" |
| 20 | 20 |
| 21 namespace browser_sync { | 21 namespace browser_sync { |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 // associated with |src|. | 444 // associated with |src|. |
| 445 const BookmarkNode* BookmarkChangeProcessor::CreateOrUpdateBookmarkNode( | 445 const BookmarkNode* BookmarkChangeProcessor::CreateOrUpdateBookmarkNode( |
| 446 sync_api::BaseNode* src, | 446 sync_api::BaseNode* src, |
| 447 BookmarkModel* model) { | 447 BookmarkModel* model) { |
| 448 const BookmarkNode* parent = | 448 const BookmarkNode* parent = |
| 449 model_associator_->GetChromeNodeFromSyncId(src->GetParentId()); | 449 model_associator_->GetChromeNodeFromSyncId(src->GetParentId()); |
| 450 if (!parent) { | 450 if (!parent) { |
| 451 DLOG(WARNING) << "Could not find parent of node being added/updated." | 451 DLOG(WARNING) << "Could not find parent of node being added/updated." |
| 452 << " Node title: " << src->GetTitle() | 452 << " Node title: " << src->GetTitle() |
| 453 << ", parent id = " << src->GetParentId(); | 453 << ", parent id = " << src->GetParentId(); |
| 454 |
| 454 return NULL; | 455 return NULL; |
| 455 } | 456 } |
| 456 int index = CalculateBookmarkModelInsertionIndex(parent, src); | 457 int index = CalculateBookmarkModelInsertionIndex(parent, src); |
| 457 const BookmarkNode* dst = model_associator_->GetChromeNodeFromSyncId( | 458 const BookmarkNode* dst = model_associator_->GetChromeNodeFromSyncId( |
| 458 src->GetId()); | 459 src->GetId()); |
| 459 if (!dst) { | 460 if (!dst) { |
| 460 dst = CreateBookmarkNode(src, parent, model, index); | 461 dst = CreateBookmarkNode(src, parent, model, index); |
| 461 model_associator_->Associate(dst, src->GetId()); | 462 model_associator_->Associate(dst, src->GetId()); |
| 462 } else { | 463 } else { |
| 463 // URL and is_folder are not expected to change. | 464 // URL and is_folder are not expected to change. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 const BookmarkNode* bookmark_node, | 547 const BookmarkNode* bookmark_node, |
| 547 BookmarkModel* model, | 548 BookmarkModel* model, |
| 548 sync_api::WriteNode* sync_node) { | 549 sync_api::WriteNode* sync_node) { |
| 549 std::vector<unsigned char> favicon_bytes; | 550 std::vector<unsigned char> favicon_bytes; |
| 550 EncodeFavicon(bookmark_node, model, &favicon_bytes); | 551 EncodeFavicon(bookmark_node, model, &favicon_bytes); |
| 551 if (!favicon_bytes.empty()) | 552 if (!favicon_bytes.empty()) |
| 552 sync_node->SetFaviconBytes(favicon_bytes); | 553 sync_node->SetFaviconBytes(favicon_bytes); |
| 553 } | 554 } |
| 554 | 555 |
| 555 } // namespace browser_sync | 556 } // namespace browser_sync |
| OLD | NEW |