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/ssl/ssl_blocking_page.h" | 5 #include "chrome/browser/ssl/ssl_blocking_page.h" |
6 | 6 |
7 #include "base/build_time.h" | 7 #include "base/build_time.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
11 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/process/launch.h" | 13 #include "base/process/launch.h" |
14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/string_piece.h" | 15 #include "base/strings/string_piece.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
20 #include "base/values.h" | 20 #include "base/values.h" |
21 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/chrome_notification_types.h" | 22 #include "chrome/browser/chrome_notification_types.h" |
23 #include "chrome/browser/history/history_service_factory.h" | 23 #include "chrome/browser/history/history_service_factory.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/renderer_preferences_util.h" | 25 #include "chrome/browser/renderer_preferences_util.h" |
26 #include "chrome/browser/ssl/ssl_error_classification.h" | 26 #include "chrome/browser/ssl/ssl_error_classification.h" |
27 #include "chrome/browser/ssl/ssl_error_info.h" | 27 #include "chrome/browser/ssl/ssl_error_info.h" |
| 28 #include "chrome/browser/ui/zoom/zoom_controller.h" |
28 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
29 #include "chrome/grit/chromium_strings.h" | 30 #include "chrome/grit/chromium_strings.h" |
30 #include "chrome/grit/generated_resources.h" | 31 #include "chrome/grit/generated_resources.h" |
31 #include "components/google/core/browser/google_util.h" | 32 #include "components/google/core/browser/google_util.h" |
32 #include "content/public/browser/cert_store.h" | 33 #include "content/public/browser/cert_store.h" |
33 #include "content/public/browser/interstitial_page.h" | 34 #include "content/public/browser/interstitial_page.h" |
34 #include "content/public/browser/navigation_controller.h" | 35 #include "content/public/browser/navigation_controller.h" |
35 #include "content/public/browser/navigation_entry.h" | 36 #include "content/public/browser/navigation_entry.h" |
36 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
37 #include "content/public/browser/notification_types.h" | 38 #include "content/public/browser/notification_types.h" |
38 #include "content/public/browser/render_process_host.h" | 39 #include "content/public/browser/render_process_host.h" |
39 #include "content/public/browser/render_view_host.h" | 40 #include "content/public/browser/render_view_host.h" |
40 #include "content/public/browser/web_contents.h" | 41 #include "content/public/browser/web_contents.h" |
| 42 #include "content/public/common/renderer_preferences.h" |
41 #include "content/public/common/ssl_status.h" | 43 #include "content/public/common/ssl_status.h" |
42 #include "grit/browser_resources.h" | 44 #include "grit/browser_resources.h" |
43 #include "net/base/hash_value.h" | 45 #include "net/base/hash_value.h" |
44 #include "net/base/net_errors.h" | 46 #include "net/base/net_errors.h" |
45 #include "net/base/net_util.h" | 47 #include "net/base/net_util.h" |
46 #include "ui/base/l10n/l10n_util.h" | 48 #include "ui/base/l10n/l10n_util.h" |
47 #include "ui/base/resource/resource_bundle.h" | 49 #include "ui/base/resource/resource_bundle.h" |
48 #include "ui/base/webui/jstemplate_builder.h" | 50 #include "ui/base/webui/jstemplate_builder.h" |
49 #include "ui/base/webui/web_ui_util.h" | 51 #include "ui/base/webui/web_ui_util.h" |
50 | 52 |
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 default: { | 593 default: { |
592 NOTREACHED(); | 594 NOTREACHED(); |
593 } | 595 } |
594 } | 596 } |
595 } | 597 } |
596 | 598 |
597 void SSLBlockingPage::OverrideRendererPrefs( | 599 void SSLBlockingPage::OverrideRendererPrefs( |
598 content::RendererPreferences* prefs) { | 600 content::RendererPreferences* prefs) { |
599 Profile* profile = Profile::FromBrowserContext( | 601 Profile* profile = Profile::FromBrowserContext( |
600 web_contents_->GetBrowserContext()); | 602 web_contents_->GetBrowserContext()); |
601 renderer_preferences_util::UpdateFromSystemSettings(prefs, profile); | 603 renderer_preferences_util::UpdateFromSystemSettings( |
| 604 prefs, profile, web_contents_); |
602 } | 605 } |
603 | 606 |
604 void SSLBlockingPage::OnProceed() { | 607 void SSLBlockingPage::OnProceed() { |
605 RecordSSLBlockingPageDetailedStats(true, | 608 RecordSSLBlockingPageDetailedStats(true, |
606 cert_error_, | 609 cert_error_, |
607 overridable_, | 610 overridable_, |
608 internal_, | 611 internal_, |
609 num_visits_, | 612 num_visits_, |
610 expired_but_previously_allowed_); | 613 expired_but_previously_allowed_); |
611 #if defined(ENABLE_EXTENSIONS) | 614 #if defined(ENABLE_EXTENSIONS) |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 for (; i < 5; i++) { | 670 for (; i < 5; i++) { |
668 strings->SetString(keys[i], std::string()); | 671 strings->SetString(keys[i], std::string()); |
669 } | 672 } |
670 } | 673 } |
671 | 674 |
672 void SSLBlockingPage::OnGotHistoryCount(bool success, | 675 void SSLBlockingPage::OnGotHistoryCount(bool success, |
673 int num_visits, | 676 int num_visits, |
674 base::Time first_visit) { | 677 base::Time first_visit) { |
675 num_visits_ = num_visits; | 678 num_visits_ = num_visits; |
676 } | 679 } |
OLD | NEW |