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

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

Issue 738683002: Move chromeos/tpm_* to chromeos/tpm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix the build Created 6 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
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/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h" 123 #include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"
124 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 124 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
125 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 125 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
126 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 126 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
127 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h" 127 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
128 #include "chrome/browser/chromeos/profiles/profile_helper.h" 128 #include "chrome/browser/chromeos/profiles/profile_helper.h"
129 #include "chrome/browser/chromeos/settings/cros_settings.h" 129 #include "chrome/browser/chromeos/settings/cros_settings.h"
130 #include "chrome/browser/net/nss_context.h" 130 #include "chrome/browser/net/nss_context.h"
131 #include "chromeos/dbus/dbus_thread_manager.h" 131 #include "chromeos/dbus/dbus_thread_manager.h"
132 #include "chromeos/settings/cros_settings_names.h" 132 #include "chromeos/settings/cros_settings_names.h"
133 #include "chromeos/tpm_token_info_getter.h" 133 #include "chromeos/tpm/tpm_token_info_getter.h"
134 #include "components/user_manager/user.h" 134 #include "components/user_manager/user.h"
135 #include "components/user_manager/user_manager.h" 135 #include "components/user_manager/user_manager.h"
136 #include "crypto/nss_util.h" 136 #include "crypto/nss_util.h"
137 #include "crypto/nss_util_internal.h" 137 #include "crypto/nss_util_internal.h"
138 #include "net/cert/cert_verifier.h" 138 #include "net/cert/cert_verifier.h"
139 #include "net/cert/multi_threaded_cert_verifier.h" 139 #include "net/cert/multi_threaded_cert_verifier.h"
140 #include "net/ssl/client_cert_store_chromeos.h" 140 #include "net/ssl/client_cert_store_chromeos.h"
141 #endif // defined(OS_CHROMEOS) 141 #endif // defined(OS_CHROMEOS)
142 142
143 #if defined(USE_NSS) 143 #if defined(USE_NSS)
(...skipping 1171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 void ProfileIOData::SetCookieSettingsForTesting( 1315 void ProfileIOData::SetCookieSettingsForTesting(
1316 CookieSettings* cookie_settings) { 1316 CookieSettings* cookie_settings) {
1317 DCHECK(!cookie_settings_.get()); 1317 DCHECK(!cookie_settings_.get());
1318 cookie_settings_ = cookie_settings; 1318 cookie_settings_ = cookie_settings;
1319 } 1319 }
1320 1320
1321 void ProfileIOData::set_signin_names_for_testing( 1321 void ProfileIOData::set_signin_names_for_testing(
1322 SigninNamesOnIOThread* signin_names) { 1322 SigninNamesOnIOThread* signin_names) {
1323 signin_names_.reset(signin_names); 1323 signin_names_.reset(signin_names);
1324 } 1324 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698