chrome/browser/safe_browsing/ui_manager.cc - Issue 2869383002: Unify safe_browsing* components [1]: move safe_browsing_prefs*

Side by Side Diff: chrome/browser/safe_browsing/ui_manager.cc

Issue 2869383002: Unify safe_browsing* components [1]: move safe_browsing_prefs* (Closed)

Patch Set: fix win bots Created 3 years, 7 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:

« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.h ('k') | chrome/browser/safe_browsing/ui_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/safe_browsing/ui_manager.h"	5 #include "chrome/browser/safe_browsing/ui_manager.h"

6	6

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

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

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

10 #include "base/metrics/histogram_macros.h"	10 #include "base/metrics/histogram_macros.h"

11 #include "base/threading/thread.h"	11 #include "base/threading/thread.h"

12 #include "base/threading/thread_restrictions.h"	12 #include "base/threading/thread_restrictions.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/history/history_service_factory.h"	14 #include "chrome/browser/history/history_service_factory.h"

15 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"	15 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"

16 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/safe_browsing/ping_manager.h"	17 #include "chrome/browser/safe_browsing/ping_manager.h"

18 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"	18 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"

19 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	19 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

20 #include "chrome/browser/tab_contents/tab_util.h"	20 #include "chrome/browser/tab_contents/tab_util.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "chrome/common/url_constants.h"	22 #include "chrome/common/url_constants.h"

23 #include "components/prefs/pref_service.h"	23 #include "components/prefs/pref_service.h"

24 #include "components/safe_browsing/browser/threat_details.h"	24 #include "components/safe_browsing/browser/threat_details.h"

25 #include "components/safe_browsing_db/safe_browsing_prefs.h"	25 #include "components/safe_browsing/common/safe_browsing_prefs.h"

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

27 #include "content/public/browser/navigation_entry.h"	27 #include "content/public/browser/navigation_entry.h"

28 #include "content/public/browser/notification_service.h"	28 #include "content/public/browser/notification_service.h"

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

30 #include "ipc/ipc_message.h"	30 #include "ipc/ipc_message.h"

31 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"	31 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"

32 #include "net/ssl/ssl_info.h"	32 #include "net/ssl/ssl_info.h"

33 #include "net/url_request/url_request_context.h"	33 #include "net/url_request/url_request_context.h"

34 #include "net/url_request/url_request_context_getter.h"	34 #include "net/url_request/url_request_context_getter.h"

35 #include "url/gurl.h"	35 #include "url/gurl.h"

(...skipping 170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
206 }	206 }

207 }	207 }

208	208

209 // Static.	209 // Static.

210 GURL SafeBrowsingUIManager::GetMainFrameWhitelistUrlForResourceForTesting(	210 GURL SafeBrowsingUIManager::GetMainFrameWhitelistUrlForResourceForTesting(

211 const security_interstitials::UnsafeResource& resource) {	211 const security_interstitials::UnsafeResource& resource) {

212 return GetMainFrameWhitelistUrlForResource(resource);	212 return GetMainFrameWhitelistUrlForResource(resource);

213 }	213 }

214	214

215 } // namespace safe_browsing	215 } // namespace safe_browsing

OLD	NEW