chrome/browser/sync/glue/bookmark_change_processor.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

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

Issue 983043003: Componentize FaviconService and FaviconHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_service

Patch Set: Fix android_aosp (reverted the change by mistake by switching computer) Created 5 years, 9 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

« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller.cc ('k') | chrome/browser/sync/glue/favicon_cache.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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 <map>	7 #include <map>

8 #include <stack>	8 #include <stack>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/location.h"	11 #include "base/location.h"

12 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

13 #include "base/strings/string_number_conversions.h"	13 #include "base/strings/string_number_conversions.h"

14 #include "base/strings/string_util.h"	14 #include "base/strings/string_util.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

17 #include "chrome/browser/favicon/favicon_service.h"

18 #include "chrome/browser/favicon/favicon_service_factory.h"	17 #include "chrome/browser/favicon/favicon_service_factory.h"

19 #include "chrome/browser/history/history_service_factory.h"	18 #include "chrome/browser/history/history_service_factory.h"

20 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/sync/profile_sync_service.h"	20 #include "chrome/browser/sync/profile_sync_service.h"

22 #include "chrome/browser/undo/bookmark_undo_service.h"	21 #include "chrome/browser/undo/bookmark_undo_service.h"

23 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	22 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

24 #include "chrome/browser/undo/bookmark_undo_utils.h"	23 #include "chrome/browser/undo/bookmark_undo_utils.h"

25 #include "components/bookmarks/browser/bookmark_client.h"	24 #include "components/bookmarks/browser/bookmark_client.h"

26 #include "components/bookmarks/browser/bookmark_model.h"	25 #include "components/bookmarks/browser/bookmark_model.h"

27 #include "components/bookmarks/browser/bookmark_utils.h"	26 #include "components/bookmarks/browser/bookmark_utils.h"

	27 #include "components/favicon/core/browser/favicon_service.h"

28 #include "components/history/core/browser/history_service.h"	28 #include "components/history/core/browser/history_service.h"

29 #include "content/public/browser/browser_thread.h"	29 #include "content/public/browser/browser_thread.h"

30 #include "sync/internal_api/public/change_record.h"	30 #include "sync/internal_api/public/change_record.h"

31 #include "sync/internal_api/public/read_node.h"	31 #include "sync/internal_api/public/read_node.h"

32 #include "sync/internal_api/public/write_node.h"	32 #include "sync/internal_api/public/write_node.h"

33 #include "sync/internal_api/public/write_transaction.h"	33 #include "sync/internal_api/public/write_transaction.h"

34 #include "sync/syncable/entry.h" // TODO(tim): Investigating bug 121587.	34 #include "sync/syncable/entry.h" // TODO(tim): Investigating bug 121587.

35 #include "sync/syncable/syncable_write_transaction.h"	35 #include "sync/syncable/syncable_write_transaction.h"

36 #include "ui/gfx/favicon_size.h"	36 #include "ui/gfx/favicon_size.h"

37 #include "ui/gfx/image/image_util.h"	37 #include "ui/gfx/image/image_util.h"

(...skipping 898 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
936 updated_specifics.set_icon_url(bookmark_node->icon_url().spec());	936 updated_specifics.set_icon_url(bookmark_node->icon_url().spec());

937 sync_node->SetBookmarkSpecifics(updated_specifics);	937 sync_node->SetBookmarkSpecifics(updated_specifics);

938 }	938 }

939 }	939 }

940	940

941 bool BookmarkChangeProcessor::CanSyncNode(const BookmarkNode* node) {	941 bool BookmarkChangeProcessor::CanSyncNode(const BookmarkNode* node) {

942 return bookmark_model_->client()->CanSyncNode(node);	942 return bookmark_model_->client()->CanSyncNode(node);

943 }	943 }

944	944

945 } // namespace browser_sync	945 } // namespace browser_sync

OLD	NEW