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

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

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 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 | Annotate | Revision Log
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_channel_id_helper.h"
18 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 19 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
19 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 20 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
20 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" 21 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
21 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" 22 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
22 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" 23 #include "chrome/browser/browsing_data/browsing_data_local_storage_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/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ssl/ssl_error_info.h" 29 #include "chrome/browser/ssl/ssl_error_info.h"
30 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h " 30 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h "
31 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 31 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
32 #include "chrome/common/content_settings_pattern.h" 32 #include "chrome/common/content_settings_pattern.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 if (visited_before_today) { 684 if (visited_before_today) {
685 first_visit_text = l10n_util::GetStringFUTF16( 685 first_visit_text = l10n_util::GetStringFUTF16(
686 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 686 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
687 base::TimeFormatShortDate(first_visit)); 687 base::TimeFormatShortDate(first_visit));
688 } else { 688 } else {
689 first_visit_text = l10n_util::GetStringUTF16( 689 first_visit_text = l10n_util::GetStringUTF16(
690 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 690 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
691 } 691 }
692 ui_->SetFirstVisit(first_visit_text); 692 ui_->SetFirstVisit(first_visit_text);
693 } 693 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698