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

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

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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"
(...skipping 21 matching lines...) Expand all
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"
34 #include "content/public/browser/cert_store.h" 34 #include "content/public/browser/cert_store.h"
35 #include "content/public/browser/user_metrics.h" 35 #include "content/public/browser/user_metrics.h"
36 #include "content/public/common/ssl_status.h" 36 #include "content/public/common/ssl_status.h"
37 #include "content/public/common/url_constants.h" 37 #include "content/public/common/url_constants.h"
38 #include "grit/chromium_strings.h" 38 #include "grit/chromium_strings.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "net/base/cert_status_flags.h" 40 #include "net/base/cert_status_flags.h"
41 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 41 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
42 #include "net/base/ssl_cipher_suite_names.h"
43 #include "net/base/ssl_connection_status_flags.h"
44 #include "net/base/x509_certificate.h" 42 #include "net/base/x509_certificate.h"
43 #include "net/ssl/ssl_cipher_suite_names.h"
44 #include "net/ssl/ssl_connection_status_flags.h"
45 #include "ui/base/l10n/l10n_util.h" 45 #include "ui/base/l10n/l10n_util.h"
46 #include "ui/base/resource/resource_bundle.h" 46 #include "ui/base/resource/resource_bundle.h"
47 47
48 using content::BrowserThread; 48 using content::BrowserThread;
49 49
50 namespace { 50 namespace {
51 51
52 // The list of content settings types to display on the Website Settings UI. 52 // The list of content settings types to display on the Website Settings UI.
53 ContentSettingsType kPermissionType[] = { 53 ContentSettingsType kPermissionType[] = {
54 CONTENT_SETTINGS_TYPE_IMAGES, 54 CONTENT_SETTINGS_TYPE_IMAGES,
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 first_visit_text = l10n_util::GetStringFUTF16( 562 first_visit_text = l10n_util::GetStringFUTF16(
563 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 563 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
564 base::TimeFormatShortDate(first_visit)); 564 base::TimeFormatShortDate(first_visit));
565 } else { 565 } else {
566 first_visit_text = l10n_util::GetStringUTF16( 566 first_visit_text = l10n_util::GetStringUTF16(
567 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 567 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
568 568
569 } 569 }
570 ui_->SetFirstVisit(first_visit_text); 570 ui_->SetFirstVisit(first_visit_text);
571 } 571 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698