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

Side by Side Diff: chrome/browser/website_settings.h

Issue 10169004: Replace UTF16 string with UTF8 string in the |WebsiteSettings| class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/website_settings.cc » ('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 #ifndef CHROME_BROWSER_WEBSITE_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_WEBSITE_SETTINGS_H_
6 #define CHROME_BROWSER_WEBSITE_SETTINGS_H_ 6 #define CHROME_BROWSER_WEBSITE_SETTINGS_H_
7 7
8 #include "base/string16.h"
9 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
10 #include "chrome/common/content_settings.h" 9 #include "chrome/common/content_settings.h"
11 #include "chrome/common/content_settings_types.h" 10 #include "chrome/common/content_settings_types.h"
12 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
13 #include "ui/gfx/native_widget_types.h" 12 #include "ui/gfx/native_widget_types.h"
14 13
15 namespace content { 14 namespace content {
16 class CertStore; 15 class CertStore;
17 struct SSLStatus; 16 struct SSLStatus;
18 } 17 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 92
94 // Accessors. 93 // Accessors.
95 SiteConnectionStatus site_connection_status() const { 94 SiteConnectionStatus site_connection_status() const {
96 return site_connection_status_; 95 return site_connection_status_;
97 } 96 }
98 97
99 SiteIdentityStatus site_identity_status() const { 98 SiteIdentityStatus site_identity_status() const {
100 return site_identity_status_; 99 return site_identity_status_;
101 } 100 }
102 101
103 string16 site_connection_details() const { 102 std::string site_connection_details() const {
104 return site_connection_details_; 103 return site_connection_details_;
105 } 104 }
106 105
107 string16 site_identity_details() const { 106 std::string site_identity_details() const {
108 return site_identity_details_; 107 return site_identity_details_;
109 } 108 }
110 109
111 string16 organization_name() const { 110 std::string organization_name() const {
112 return organization_name_; 111 return organization_name_;
113 } 112 }
114 113
115 private: 114 private:
116 ~WebsiteSettings(); 115 ~WebsiteSettings();
117 116
118 // Initializes the |WebsiteSettings|. 117 // Initializes the |WebsiteSettings|.
119 void Init(Profile* profile, 118 void Init(Profile* profile,
120 const GURL& url, 119 const GURL& url,
121 const content::SSLStatus& ssl); 120 const content::SSLStatus& ssl);
(...skipping 12 matching lines...) Expand all
134 GURL site_url_; 133 GURL site_url_;
135 134
136 // Status of the website's identity verification check. 135 // Status of the website's identity verification check.
137 SiteIdentityStatus site_identity_status_; 136 SiteIdentityStatus site_identity_status_;
138 137
139 // Status of the connection to the website. 138 // Status of the connection to the website.
140 SiteConnectionStatus site_connection_status_; 139 SiteConnectionStatus site_connection_status_;
141 140
142 // Details about the website's identity. If the website's identity has been 141 // Details about the website's identity. If the website's identity has been
143 // verified then |site_identity_details_| contains who verified the identity. 142 // verified then |site_identity_details_| contains who verified the identity.
144 string16 site_identity_details_; 143 std::string site_identity_details_;
145 144
146 // Details about the connection to the website. In case of an encrypted 145 // Details about the connection to the website. In case of an encrypted
147 // connection |site_connection_details_| contains encryption details, like 146 // connection |site_connection_details_| contains encryption details, like
148 // encryption strength and ssl protocol version. 147 // encryption strength and ssl protocol version.
149 string16 site_connection_details_; 148 std::string site_connection_details_;
150 149
151 // For websites that provided an EV certificate |orgainization_name_| contains 150 // For websites that provided an EV certificate |orgainization_name_| contains
152 // the organization name of the certificate. In all other cases 151 // the organization name of the certificate. In all other cases
153 // |organization_name| is an empty string. 152 // |organization_name| is an empty string.
154 string16 organization_name_; 153 std::string organization_name_;
155 154
156 // The |CertStore| provides all X509Certificates. 155 // The |CertStore| provides all X509Certificates.
157 content::CertStore* cert_store_; 156 content::CertStore* cert_store_;
158 157
159 // The |HostContentSettingsMap| is the service that provides and manages 158 // The |HostContentSettingsMap| is the service that provides and manages
160 // content settings (aka. site permissions). 159 // content settings (aka. site permissions).
161 HostContentSettingsMap* content_settings_; 160 HostContentSettingsMap* content_settings_;
162 161
163 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); 162 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
164 }; 163 };
165 164
166 #endif // CHROME_BROWSER_WEBSITE_SETTINGS_H_ 165 #endif // CHROME_BROWSER_WEBSITE_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/website_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698