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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months 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
« no previous file with comments | « chrome/browser/speech/speech_input_manager.h ('k') | chrome/browser/sync/sync_setup_flow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 4 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
5 5
6 #include <stack> 6 #include <stack>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 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"
19 #include "third_party/skia/include/core/SkBitmap.h" 18 #include "third_party/skia/include/core/SkBitmap.h"
19 #include "ui/gfx/codec/png_codec.h"
20 20
21 namespace browser_sync { 21 namespace browser_sync {
22 22
23 BookmarkChangeProcessor::BookmarkChangeProcessor( 23 BookmarkChangeProcessor::BookmarkChangeProcessor(
24 BookmarkModelAssociator* model_associator, 24 BookmarkModelAssociator* model_associator,
25 UnrecoverableErrorHandler* error_handler) 25 UnrecoverableErrorHandler* error_handler)
26 : ChangeProcessor(error_handler), 26 : ChangeProcessor(error_handler),
27 bookmark_model_(NULL), 27 bookmark_model_(NULL),
28 model_associator_(model_associator) { 28 model_associator_(model_associator) {
29 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 29 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 const BookmarkNode* bookmark_node, 547 const BookmarkNode* bookmark_node,
548 BookmarkModel* model, 548 BookmarkModel* model,
549 sync_api::WriteNode* sync_node) { 549 sync_api::WriteNode* sync_node) {
550 std::vector<unsigned char> favicon_bytes; 550 std::vector<unsigned char> favicon_bytes;
551 EncodeFavicon(bookmark_node, model, &favicon_bytes); 551 EncodeFavicon(bookmark_node, model, &favicon_bytes);
552 if (!favicon_bytes.empty()) 552 if (!favicon_bytes.empty())
553 sync_node->SetFaviconBytes(favicon_bytes); 553 sync_node->SetFaviconBytes(favicon_bytes);
554 } 554 }
555 555
556 } // namespace browser_sync 556 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/speech/speech_input_manager.h ('k') | chrome/browser/sync/sync_setup_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698