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

Side by Side Diff: chrome/browser/sync/glue/bookmark_change_processor.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 5 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
6 6
7 #include <stack> 7 #include <stack>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 14 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #include "chrome/browser/bookmarks/bookmark_utils.h" 15 #include "chrome/browser/bookmarks/bookmark_utils.h"
16 #include "chrome/browser/favicon/favicon_service.h" 16 #include "chrome/browser/favicon/favicon_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/sync/internal_api/change_record.h" 18 #include "chrome/browser/sync/internal_api/change_record.h"
19 #include "chrome/browser/sync/internal_api/read_node.h" 19 #include "chrome/browser/sync/internal_api/read_node.h"
20 #include "chrome/browser/sync/internal_api/write_node.h" 20 #include "chrome/browser/sync/internal_api/write_node.h"
21 #include "chrome/browser/sync/internal_api/write_transaction.h" 21 #include "chrome/browser/sync/internal_api/write_transaction.h"
22 #include "chrome/browser/sync/profile_sync_service.h" 22 #include "chrome/browser/sync/profile_sync_service.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
25 #include "ui/gfx/codec/png_codec.h" 25 #include "ui/gfx/codec/png_codec.h"
26 26
27 using content::BrowserThread;
28
27 namespace browser_sync { 29 namespace browser_sync {
28 30
29 BookmarkChangeProcessor::BookmarkChangeProcessor( 31 BookmarkChangeProcessor::BookmarkChangeProcessor(
30 BookmarkModelAssociator* model_associator, 32 BookmarkModelAssociator* model_associator,
31 UnrecoverableErrorHandler* error_handler) 33 UnrecoverableErrorHandler* error_handler)
32 : ChangeProcessor(error_handler), 34 : ChangeProcessor(error_handler),
33 bookmark_model_(NULL), 35 bookmark_model_(NULL),
34 model_associator_(model_associator) { 36 model_associator_(model_associator) {
35 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
36 DCHECK(model_associator); 38 DCHECK(model_associator);
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 const BookmarkNode* bookmark_node, 564 const BookmarkNode* bookmark_node,
563 BookmarkModel* model, 565 BookmarkModel* model,
564 sync_api::WriteNode* sync_node) { 566 sync_api::WriteNode* sync_node) {
565 std::vector<unsigned char> favicon_bytes; 567 std::vector<unsigned char> favicon_bytes;
566 EncodeFavicon(bookmark_node, model, &favicon_bytes); 568 EncodeFavicon(bookmark_node, model, &favicon_bytes);
567 if (!favicon_bytes.empty()) 569 if (!favicon_bytes.empty())
568 sync_node->SetFaviconBytes(favicon_bytes); 570 sync_node->SetFaviconBytes(favicon_bytes);
569 } 571 }
570 572
571 } // namespace browser_sync 573 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698