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

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

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
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"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/content_settings/host_content_settings_map.h" 26 #include "chrome/browser/content_settings/host_content_settings_map.h"
27 #include "chrome/browser/content_settings/local_shared_objects_container.h" 27 #include "chrome/browser/content_settings/local_shared_objects_container.h"
28 #include "chrome/browser/history/history_service_factory.h" 28 #include "chrome/browser/history/history_service_factory.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
32 #include "chrome/browser/ssl/ssl_error_info.h" 32 #include "chrome/browser/ssl/ssl_error_info.h"
33 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h " 33 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h "
34 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 34 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/content_settings_pattern.h"
37 #include "chrome/grit/chromium_strings.h" 36 #include "chrome/grit/chromium_strings.h"
38 #include "chrome/grit/generated_resources.h" 37 #include "chrome/grit/generated_resources.h"
38 #include "components/content_settings/core/common/content_settings_pattern.h"
39 #include "content/public/browser/browser_thread.h" 39 #include "content/public/browser/browser_thread.h"
40 #include "content/public/browser/cert_store.h" 40 #include "content/public/browser/cert_store.h"
41 #include "content/public/browser/user_metrics.h" 41 #include "content/public/browser/user_metrics.h"
42 #include "content/public/common/content_switches.h" 42 #include "content/public/common/content_switches.h"
43 #include "content/public/common/ssl_status.h" 43 #include "content/public/common/ssl_status.h"
44 #include "content/public/common/url_constants.h" 44 #include "content/public/common/url_constants.h"
45 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 45 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
46 #include "net/cert/cert_status_flags.h" 46 #include "net/cert/cert_status_flags.h"
47 #include "net/cert/x509_certificate.h" 47 #include "net/cert/x509_certificate.h"
48 #include "net/ssl/ssl_cipher_suite_names.h" 48 #include "net/ssl/ssl_cipher_suite_names.h"
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 if (visited_before_today) { 737 if (visited_before_today) {
738 first_visit_text = l10n_util::GetStringFUTF16( 738 first_visit_text = l10n_util::GetStringFUTF16(
739 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 739 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
740 base::TimeFormatShortDate(first_visit)); 740 base::TimeFormatShortDate(first_visit));
741 } else { 741 } else {
742 first_visit_text = l10n_util::GetStringUTF16( 742 first_visit_text = l10n_util::GetStringUTF16(
743 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 743 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
744 } 744 }
745 ui_->SetFirstVisit(first_visit_text); 745 ui_->SetFirstVisit(first_visit_text);
746 } 746 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698