Chromium Code Reviews| Index: chrome/browser/sync/glue/bookmark_change_processor.cc |
| diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc |
| index 80e02c3ce25a1ccfe4255898c2ab6e9b52e96afe..5b1384000d742443d588035fd1e44041c9c9dfac 100644 |
| --- a/chrome/browser/sync/glue/bookmark_change_processor.cc |
| +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc |
| @@ -1,7 +1,6 @@ |
| // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| - |
| #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
| #include <stack> |
| @@ -9,6 +8,7 @@ |
| #include "base/string16.h" |
| #include "base/string_util.h" |
| + |
| #include "base/utf_string_conversions.h" |
| #include "chrome/browser/bookmarks/bookmark_utils.h" |
| #include "chrome/browser/browser_thread.h" |
| @@ -18,6 +18,7 @@ |
| #include "gfx/codec/png_codec.h" |
| #include "third_party/skia/include/core/SkBitmap.h" |
|
tim (not reviewing)
2010/12/15 20:11:42
nit - extra newline.
lipalani
2010/12/15 21:28:15
Done.
|
| + |
| namespace browser_sync { |
| BookmarkChangeProcessor::BookmarkChangeProcessor( |
| @@ -47,6 +48,7 @@ void BookmarkChangeProcessor::StopImpl() { |
| model_associator_ = NULL; |
| } |
|
tim (not reviewing)
2010/12/15 20:11:42
extra newline.
lipalani
2010/12/15 21:28:15
Done.
|
| + |
| void BookmarkChangeProcessor::UpdateSyncNodeProperties( |
| const BookmarkNode* src, BookmarkModel* model, sync_api::WriteNode* dst) { |
| // Set the properties of the item. |
| @@ -451,6 +453,7 @@ const BookmarkNode* BookmarkChangeProcessor::CreateOrUpdateBookmarkNode( |
| DLOG(WARNING) << "Could not find parent of node being added/updated." |
| << " Node title: " << src->GetTitle() |
| << ", parent id = " << src->GetParentId(); |
| + |
| return NULL; |
| } |
| int index = CalculateBookmarkModelInsertionIndex(parent, src); |