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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: certdb: handle GetCertTrust and IsUntrusted, failed attempt to handle SetCertTrust Created 7 years, 1 month 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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // because on linux it relies on initializing things through gconf, 269 // because on linux it relies on initializing things through gconf,
270 // and needs to be on the main thread. 270 // and needs to be on the main thread.
271 scoped_ptr<net::ProxyConfigService> proxy_config_service; 271 scoped_ptr<net::ProxyConfigService> proxy_config_service;
272 272
273 #if defined(ENABLE_MANAGED_USERS) 273 #if defined(ENABLE_MANAGED_USERS)
274 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; 274 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
275 #endif 275 #endif
276 276
277 #if defined(OS_CHROMEOS) 277 #if defined(OS_CHROMEOS)
278 scoped_ptr<policy::PolicyCertVerifier> cert_verifier; 278 scoped_ptr<policy::PolicyCertVerifier> cert_verifier;
279 std::string username_hash;
279 #endif 280 #endif
280 281
281 // The profile this struct was populated from. It's passed as a void* to 282 // The profile this struct was populated from. It's passed as a void* to
282 // ensure it's not accidently used on the IO thread. Before using it on the 283 // ensure it's not accidently used on the IO thread. Before using it on the
283 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 284 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
284 void* profile; 285 void* profile;
285 }; 286 };
286 287
287 explicit ProfileIOData(bool is_incognito); 288 explicit ProfileIOData(bool is_incognito);
288 289
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 537
537 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 538 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
538 bool initialized_on_UI_thread_; 539 bool initialized_on_UI_thread_;
539 540
540 bool is_incognito_; 541 bool is_incognito_;
541 542
542 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 543 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
543 }; 544 };
544 545
545 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 546 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/client_cert_store_chromeos.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698