chrome/browser/safe_browsing/safe_browsing_blocking_page.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/safe_browsing/local_database_manager.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.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 (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 // Implementation of the SafeBrowsingBlockingPage class.	5 // Implementation of the SafeBrowsingBlockingPage class.

6	6

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

8	8

9 #include <string>	9 #include <string>

10	10

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

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/i18n/rtl.h"	13 #include "base/i18n/rtl.h"

14 #include "base/lazy_instance.h"	14 #include "base/lazy_instance.h"

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

16 #include "base/metrics/field_trial.h"	16 #include "base/metrics/field_trial.h"

17 #include "base/metrics/histogram.h"	17 #include "base/metrics/histogram.h"

18 #include "base/prefs/pref_service.h"

19 #include "base/strings/string_number_conversions.h"	18 #include "base/strings/string_number_conversions.h"

20 #include "base/strings/string_piece.h"	19 #include "base/strings/string_piece.h"

21 #include "base/strings/stringprintf.h"	20 #include "base/strings/stringprintf.h"

22 #include "base/strings/utf_string_conversions.h"	21 #include "base/strings/utf_string_conversions.h"

23 #include "base/time/time.h"	22 #include "base/time/time.h"

24 #include "base/values.h"	23 #include "base/values.h"

25 #include "chrome/browser/browser_process.h"	24 #include "chrome/browser/browser_process.h"

26 #include "chrome/browser/profiles/profile.h"	25 #include "chrome/browser/profiles/profile.h"

27 #include "chrome/browser/renderer_preferences_util.h"	26 #include "chrome/browser/renderer_preferences_util.h"

28 #include "chrome/browser/safe_browsing/threat_details.h"	27 #include "chrome/browser/safe_browsing/threat_details.h"

29 #include "chrome/browser/safe_browsing/ui_manager.h"	28 #include "chrome/browser/safe_browsing/ui_manager.h"

30 #include "chrome/browser/tab_contents/tab_util.h"	29 #include "chrome/browser/tab_contents/tab_util.h"

31 #include "chrome/common/chrome_switches.h"	30 #include "chrome/common/chrome_switches.h"

32 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

33 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

34 #include "chrome/grit/generated_resources.h"	33 #include "chrome/grit/generated_resources.h"

35 #include "chrome/grit/locale_settings.h"	34 #include "chrome/grit/locale_settings.h"

36 #include "components/google/core/browser/google_util.h"	35 #include "components/google/core/browser/google_util.h"

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

37 #include "components/security_interstitials/core/controller_client.h"	37 #include "components/security_interstitials/core/controller_client.h"

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

39 #include "content/public/browser/interstitial_page.h"	39 #include "content/public/browser/interstitial_page.h"

40 #include "content/public/browser/navigation_controller.h"	40 #include "content/public/browser/navigation_controller.h"

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

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

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

44 #include "content/public/common/renderer_preferences.h"	44 #include "content/public/common/renderer_preferences.h"

45 #include "grit/browser_resources.h"	45 #include "grit/browser_resources.h"

46 #include "net/base/escape.h"	46 #include "net/base/escape.h"

(...skipping 674 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
721 } else {	721 } else {

722 load_time_data->SetString(	722 load_time_data->SetString(

723 "finalParagraph",	723 "finalParagraph",

724 l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));	724 l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));

725 }	725 }

726	726

727 PopulateExtendedReportingOption(load_time_data);	727 PopulateExtendedReportingOption(load_time_data);

728 }	728 }

729	729

730 } // namespace safe_browsing	730 } // namespace safe_browsing

OLD	NEW