Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 18 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
19 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 19 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
20 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" 20 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
21 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" 21 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
22 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" 22 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
23 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" 23 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
24 #include "chrome/browser/content_settings/content_settings_utils.h" 24 #include "chrome/browser/content_settings/content_settings_utils.h"
25 #include "chrome/browser/content_settings/host_content_settings_map.h" 25 #include "chrome/browser/content_settings/host_content_settings_map.h"
26 #include "chrome/browser/content_settings/local_shared_objects_container.h" 26 #include "chrome/browser/content_settings/local_shared_objects_container.h"
27 #include "chrome/browser/history/history_service_factory.h" 27 #include "chrome/browser/history/history_service_factory.h"
28 #include "chrome/browser/policy/profile_policy_connector.h"
29 #include "chrome/browser/policy/profile_policy_connector_factory.h"
30 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/ssl/ssl_error_info.h" 29 #include "chrome/browser/ssl/ssl_error_info.h"
32 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h " 30 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h "
33 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 31 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
34 #include "chrome/common/content_settings_pattern.h" 32 #include "chrome/common/content_settings_pattern.h"
35 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/cert_store.h" 34 #include "content/public/browser/cert_store.h"
37 #include "content/public/browser/user_metrics.h" 35 #include "content/public/browser/user_metrics.h"
38 #include "content/public/common/content_switches.h" 36 #include "content/public/common/content_switches.h"
39 #include "content/public/common/ssl_status.h" 37 #include "content/public/common/ssl_status.h"
40 #include "content/public/common/url_constants.h" 38 #include "content/public/common/url_constants.h"
41 #include "grit/chromium_strings.h" 39 #include "grit/chromium_strings.h"
42 #include "grit/generated_resources.h" 40 #include "grit/generated_resources.h"
43 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 41 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
44 #include "net/cert/cert_status_flags.h" 42 #include "net/cert/cert_status_flags.h"
45 #include "net/cert/x509_certificate.h" 43 #include "net/cert/x509_certificate.h"
46 #include "net/ssl/ssl_cipher_suite_names.h" 44 #include "net/ssl/ssl_cipher_suite_names.h"
47 #include "net/ssl/ssl_connection_status_flags.h" 45 #include "net/ssl/ssl_connection_status_flags.h"
48 #include "ui/base/l10n/l10n_util.h" 46 #include "ui/base/l10n/l10n_util.h"
49 #include "ui/base/resource/resource_bundle.h" 47 #include "ui/base/resource/resource_bundle.h"
50 48
49 #if defined(OS_CHROMEOS)
50 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
51 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
52 #endif
53
51 using content::BrowserThread; 54 using content::BrowserThread;
52 55
53 namespace { 56 namespace {
54 57
55 // The list of content settings types to display on the Website Settings UI. 58 // The list of content settings types to display on the Website Settings UI.
56 ContentSettingsType kPermissionType[] = { 59 ContentSettingsType kPermissionType[] = {
57 CONTENT_SETTINGS_TYPE_IMAGES, 60 CONTENT_SETTINGS_TYPE_IMAGES,
58 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 61 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
59 CONTENT_SETTINGS_TYPE_PLUGINS, 62 CONTENT_SETTINGS_TYPE_PLUGINS,
60 CONTENT_SETTINGS_TYPE_POPUPS, 63 CONTENT_SETTINGS_TYPE_POPUPS,
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY)); 260 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
258 } 261 }
259 262
260 cert_id_ = ssl.cert_id; 263 cert_id_ = ssl.cert_id;
261 264
262 if (ssl.cert_id && 265 if (ssl.cert_id &&
263 cert_store_->RetrieveCert(ssl.cert_id, &cert) && 266 cert_store_->RetrieveCert(ssl.cert_id, &cert) &&
264 (!net::IsCertStatusError(ssl.cert_status) || 267 (!net::IsCertStatusError(ssl.cert_status) ||
265 net::IsCertStatusMinorError(ssl.cert_status))) { 268 net::IsCertStatusMinorError(ssl.cert_status))) {
266 // There are no major errors. Check for minor errors. 269 // There are no major errors. Check for minor errors.
267 if (policy::ProfilePolicyConnectorFactory::GetForProfile(profile)-> 270 #if defined(OS_CHROMEOS)
268 UsedPolicyCertificates()) { 271 policy::PolicyCertService* service =
272 policy::PolicyCertServiceFactory::GetForProfile(profile);
273 const bool used_policy_certs = service && service->UsedPolicyCertificates();
274 #else
275 const bool used_policy_certs = false;
276 #endif
277 if (used_policy_certs) {
269 site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT; 278 site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT;
270 site_identity_details_ = 279 site_identity_details_ = l10n_util::GetStringFUTF16(
271 l10n_util::GetStringFUTF16(IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, 280 IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(url.host()));
272 UTF8ToUTF16(url.host()));
273 } else if (net::IsCertStatusMinorError(ssl.cert_status)) { 281 } else if (net::IsCertStatusMinorError(ssl.cert_status)) {
274 site_identity_status_ = SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN; 282 site_identity_status_ = SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN;
275 string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName())); 283 string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName()));
276 if (issuer_name.empty()) { 284 if (issuer_name.empty()) {
277 issuer_name.assign(l10n_util::GetStringUTF16( 285 issuer_name.assign(l10n_util::GetStringUTF16(
278 IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY)); 286 IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
279 } 287 }
280 site_identity_details_.assign(l10n_util::GetStringFUTF16( 288 site_identity_details_.assign(l10n_util::GetStringFUTF16(
281 IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name)); 289 IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
282 290
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 first_visit_text = l10n_util::GetStringFUTF16( 611 first_visit_text = l10n_util::GetStringFUTF16(
604 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 612 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
605 base::TimeFormatShortDate(first_visit)); 613 base::TimeFormatShortDate(first_visit));
606 } else { 614 } else {
607 first_visit_text = l10n_util::GetStringUTF16( 615 first_visit_text = l10n_util::GetStringUTF16(
608 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 616 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
609 617
610 } 618 }
611 ui_->SetFirstVisit(first_visit_text); 619 ui_->SetFirstVisit(first_visit_text);
612 } 620 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model_impl.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698