chrome/browser/bookmarks/chrome_bookmark_client.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

Side by Side Diff: chrome/browser/bookmarks/chrome_bookmark_client.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/bookmarks/bookmark_html_writer_unittest.cc ('k') | chrome/browser/extensions/api/management/chrome_management_api_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/bookmarks/chrome_bookmark_client.h"	5 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/values.h"	10 #include "base/values.h"

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

12 #include "chrome/browser/favicon/favicon_service_factory.h"	11 #include "chrome/browser/favicon/favicon_service_factory.h"

13 #include "chrome/browser/policy/profile_policy_connector.h"	12 #include "chrome/browser/policy/profile_policy_connector.h"

14 #include "chrome/browser/policy/profile_policy_connector_factory.h"	13 #include "chrome/browser/policy/profile_policy_connector_factory.h"

15 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

16 #include "components/bookmarks/browser/bookmark_model.h"	15 #include "components/bookmarks/browser/bookmark_model.h"

17 #include "components/bookmarks/browser/bookmark_node.h"	16 #include "components/bookmarks/browser/bookmark_node.h"

18 #include "components/bookmarks/browser/bookmark_utils.h"	17 #include "components/bookmarks/browser/bookmark_utils.h"

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

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

20 #include "components/history/core/browser/url_database.h"	20 #include "components/history/core/browser/url_database.h"

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

22 #include "content/public/browser/notification_details.h"	22 #include "content/public/browser/notification_details.h"

23 #include "content/public/browser/notification_source.h"	23 #include "content/public/browser/notification_source.h"

24 #include "content/public/browser/user_metrics.h"	24 #include "content/public/browser/user_metrics.h"

25 #include "grit/components_strings.h"	25 #include "grit/components_strings.h"

26 #include "policy/policy_constants.h"	26 #include "policy/policy_constants.h"

27 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

28	28

(...skipping 248 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
277 return extra_nodes.Pass();	277 return extra_nodes.Pass();

278 }	278 }

279	279

280 std::string ChromeBookmarkClient::GetManagedBookmarksDomain() {	280 std::string ChromeBookmarkClient::GetManagedBookmarksDomain() {

281 policy::ProfilePolicyConnector* connector =	281 policy::ProfilePolicyConnector* connector =

282 policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile_);	282 policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile_);

283 if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))	283 if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))

284 return connector->GetManagementDomain();	284 return connector->GetManagementDomain();

285 return std::string();	285 return std::string();

286 }	286 }

OLD	NEW