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

Side by Side Diff: chrome/browser/ui/cocoa/cookie_details.mm

Issue 6064003: Update the time formatting APIs to use string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/cocoa/cookie_details.h" 5 #include "chrome/browser/ui/cocoa/cookie_details.h"
6 6
7 #include "app/l10n_util_mac.h" 7 #include "app/l10n_util_mac.h"
8 #import "base/i18n/time_formatting.h" 8 #import "base/i18n/time_formatting.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if ((self = [super init])) { 121 if ((self = [super init])) {
122 type_ = kCocoaCookieDetailsTypeCookie; 122 type_ = kCocoaCookieDetailsTypeCookie;
123 hasExpiration_ = cookie->DoesExpire(); 123 hasExpiration_ = cookie->DoesExpire();
124 canEditExpiration_ = canEditExpiration && hasExpiration_; 124 canEditExpiration_ = canEditExpiration && hasExpiration_;
125 name_.reset([base::SysUTF8ToNSString(cookie->Name()) retain]); 125 name_.reset([base::SysUTF8ToNSString(cookie->Name()) retain]);
126 content_.reset([base::SysUTF8ToNSString(cookie->Value()) retain]); 126 content_.reset([base::SysUTF8ToNSString(cookie->Value()) retain]);
127 path_.reset([base::SysUTF8ToNSString(cookie->Path()) retain]); 127 path_.reset([base::SysUTF8ToNSString(cookie->Path()) retain]);
128 domain_.reset([origin retain]); 128 domain_.reset([origin retain]);
129 129
130 if (cookie->DoesExpire()) { 130 if (cookie->DoesExpire()) {
131 expires_.reset([base::SysWideToNSString( 131 expires_.reset([base::SysUTF16ToNSString(
132 base::TimeFormatFriendlyDateAndTime(cookie->ExpiryDate())) retain]); 132 base::TimeFormatFriendlyDateAndTime(cookie->ExpiryDate())) retain]);
133 } else { 133 } else {
134 expires_.reset([l10n_util::GetNSStringWithFixup( 134 expires_.reset([l10n_util::GetNSStringWithFixup(
135 IDS_COOKIES_COOKIE_EXPIRES_SESSION) retain]); 135 IDS_COOKIES_COOKIE_EXPIRES_SESSION) retain]);
136 } 136 }
137 137
138 created_.reset([base::SysWideToNSString( 138 created_.reset([base::SysUTF16ToNSString(
139 base::TimeFormatFriendlyDateAndTime(cookie->CreationDate())) retain]); 139 base::TimeFormatFriendlyDateAndTime(cookie->CreationDate())) retain]);
140 140
141 if (cookie->IsSecure()) { 141 if (cookie->IsSecure()) {
142 sendFor_.reset([l10n_util::GetNSStringWithFixup( 142 sendFor_.reset([l10n_util::GetNSStringWithFixup(
143 IDS_COOKIES_COOKIE_SENDFOR_SECURE) retain]); 143 IDS_COOKIES_COOKIE_SENDFOR_SECURE) retain]);
144 } else { 144 } else {
145 sendFor_.reset([l10n_util::GetNSStringWithFixup( 145 sendFor_.reset([l10n_util::GetNSStringWithFixup(
146 IDS_COOKIES_COOKIE_SENDFOR_ANY) retain]); 146 IDS_COOKIES_COOKIE_SENDFOR_ANY) retain]);
147 } 147 }
148 } 148 }
149 return self; 149 return self;
150 } 150 }
151 151
152 - (id)initWithDatabase:(const BrowsingDataDatabaseHelper::DatabaseInfo*) 152 - (id)initWithDatabase:(const BrowsingDataDatabaseHelper::DatabaseInfo*)
153 databaseInfo { 153 databaseInfo {
154 if ((self = [super init])) { 154 if ((self = [super init])) {
155 type_ = kCocoaCookieDetailsTypeTreeDatabase; 155 type_ = kCocoaCookieDetailsTypeTreeDatabase;
156 canEditExpiration_ = NO; 156 canEditExpiration_ = NO;
157 databaseDescription_.reset([base::SysUTF8ToNSString( 157 databaseDescription_.reset([base::SysUTF8ToNSString(
158 databaseInfo->description) retain]); 158 databaseInfo->description) retain]);
159 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(databaseInfo->size, 159 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(databaseInfo->size,
160 GetByteDisplayUnits(databaseInfo->size), true)) retain]); 160 GetByteDisplayUnits(databaseInfo->size), true)) retain]);
161 lastModified_.reset([base::SysWideToNSString( 161 lastModified_.reset([base::SysUTF16ToNSString(
162 base::TimeFormatFriendlyDateAndTime( 162 base::TimeFormatFriendlyDateAndTime(
163 databaseInfo->last_modified)) retain]); 163 databaseInfo->last_modified)) retain]);
164 } 164 }
165 return self; 165 return self;
166 } 166 }
167 167
168 - (id)initWithLocalStorage:( 168 - (id)initWithLocalStorage:(
169 const BrowsingDataLocalStorageHelper::LocalStorageInfo*)storageInfo { 169 const BrowsingDataLocalStorageHelper::LocalStorageInfo*)storageInfo {
170 if ((self = [super init])) { 170 if ((self = [super init])) {
171 type_ = kCocoaCookieDetailsTypeTreeLocalStorage; 171 type_ = kCocoaCookieDetailsTypeTreeLocalStorage;
172 canEditExpiration_ = NO; 172 canEditExpiration_ = NO;
173 domain_.reset([base::SysUTF8ToNSString(storageInfo->origin) retain]); 173 domain_.reset([base::SysUTF8ToNSString(storageInfo->origin) retain]);
174 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(storageInfo->size, 174 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(storageInfo->size,
175 GetByteDisplayUnits(storageInfo->size), true)) retain]); 175 GetByteDisplayUnits(storageInfo->size), true)) retain]);
176 lastModified_.reset([base::SysWideToNSString( 176 lastModified_.reset([base::SysUTF16ToNSString(
177 base::TimeFormatFriendlyDateAndTime( 177 base::TimeFormatFriendlyDateAndTime(
178 storageInfo->last_modified)) retain]); 178 storageInfo->last_modified)) retain]);
179 } 179 }
180 return self; 180 return self;
181 } 181 }
182 182
183 - (id)initWithAppCacheInfo:(const appcache::AppCacheInfo*)appcacheInfo { 183 - (id)initWithAppCacheInfo:(const appcache::AppCacheInfo*)appcacheInfo {
184 if ((self = [super init])) { 184 if ((self = [super init])) {
185 type_ = kCocoaCookieDetailsTypeTreeAppCache; 185 type_ = kCocoaCookieDetailsTypeTreeAppCache;
186 canEditExpiration_ = NO; 186 canEditExpiration_ = NO;
187 manifestURL_.reset([base::SysUTF8ToNSString( 187 manifestURL_.reset([base::SysUTF8ToNSString(
188 appcacheInfo->manifest_url.spec()) retain]); 188 appcacheInfo->manifest_url.spec()) retain]);
189 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(appcacheInfo->size, 189 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(appcacheInfo->size,
190 GetByteDisplayUnits(appcacheInfo->size), true)) retain]); 190 GetByteDisplayUnits(appcacheInfo->size), true)) retain]);
191 created_.reset([base::SysWideToNSString( 191 created_.reset([base::SysUTF16ToNSString(
192 base::TimeFormatFriendlyDateAndTime( 192 base::TimeFormatFriendlyDateAndTime(
193 appcacheInfo->creation_time)) retain]); 193 appcacheInfo->creation_time)) retain]);
194 lastAccessed_.reset([base::SysWideToNSString( 194 lastAccessed_.reset([base::SysUTF16ToNSString(
195 base::TimeFormatFriendlyDateAndTime( 195 base::TimeFormatFriendlyDateAndTime(
196 appcacheInfo->last_access_time)) retain]); 196 appcacheInfo->last_access_time)) retain]);
197 } 197 }
198 return self; 198 return self;
199 } 199 }
200 200
201 - (id)initWithDatabase:(const std::string&)domain 201 - (id)initWithDatabase:(const std::string&)domain
202 databaseName:(const string16&)databaseName 202 databaseName:(const string16&)databaseName
203 databaseDescription:(const string16&)databaseDescription 203 databaseDescription:(const string16&)databaseDescription
204 fileSize:(unsigned long)fileSize { 204 fileSize:(unsigned long)fileSize {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 } 238 }
239 239
240 - (id)initWithIndexedDBInfo: 240 - (id)initWithIndexedDBInfo:
241 (const BrowsingDataIndexedDBHelper::IndexedDBInfo*)indexedDBInfo { 241 (const BrowsingDataIndexedDBHelper::IndexedDBInfo*)indexedDBInfo {
242 if ((self = [super init])) { 242 if ((self = [super init])) {
243 type_ = kCocoaCookieDetailsTypeTreeIndexedDB; 243 type_ = kCocoaCookieDetailsTypeTreeIndexedDB;
244 canEditExpiration_ = NO; 244 canEditExpiration_ = NO;
245 domain_.reset([base::SysUTF8ToNSString(indexedDBInfo->origin) retain]); 245 domain_.reset([base::SysUTF8ToNSString(indexedDBInfo->origin) retain]);
246 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(indexedDBInfo->size, 246 fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(indexedDBInfo->size,
247 GetByteDisplayUnits(indexedDBInfo->size), true)) retain]); 247 GetByteDisplayUnits(indexedDBInfo->size), true)) retain]);
248 lastModified_.reset([base::SysWideToNSString( 248 lastModified_.reset([base::SysUTF16ToNSString(
249 base::TimeFormatFriendlyDateAndTime( 249 base::TimeFormatFriendlyDateAndTime(
250 indexedDBInfo->last_modified)) retain]); 250 indexedDBInfo->last_modified)) retain]);
251 } 251 }
252 return self; 252 return self;
253 } 253 }
254 254
255 + (CocoaCookieDetails*)createFromCookieTreeNode:(CookieTreeNode*)treeNode { 255 + (CocoaCookieDetails*)createFromCookieTreeNode:(CookieTreeNode*)treeNode {
256 CookieTreeNode::DetailedInfo info = treeNode->GetDetailedInfo(); 256 CookieTreeNode::DetailedInfo info = treeNode->GetDetailedInfo();
257 CookieTreeNode::DetailedInfo::NodeType nodeType = info.node_type; 257 CookieTreeNode::DetailedInfo::NodeType nodeType = info.node_type;
258 NSString* origin; 258 NSString* origin;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 details_.reset([details retain]); 290 details_.reset([details retain]);
291 } 291 }
292 return self; 292 return self;
293 } 293 }
294 294
295 - (CocoaCookieDetails*)details { 295 - (CocoaCookieDetails*)details {
296 return details_.get(); 296 return details_.get();
297 } 297 }
298 298
299 @end 299 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698