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

Side by Side Diff: chrome/browser/chromeos/login/profile_auth_data.cc

Issue 11991002: Merge 176800 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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/chromeos/login/profile_auth_data.h" 5 #include "chrome/browser/chromeos/login/profile_auth_data.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "net/base/server_bound_cert_service.h" 9 #include "net/base/server_bound_cert_service.h"
10 #include "net/base/server_bound_cert_store.h" 10 #include "net/base/server_bound_cert_store.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 TransferDefaultCookiesAndServerBoundCerts(from_profile, 157 TransferDefaultCookiesAndServerBoundCerts(from_profile,
158 to_profile, 158 to_profile,
159 cookies_transfered_callback); 159 cookies_transfered_callback);
160 } else { 160 } else {
161 BrowserThread::PostTask( 161 BrowserThread::PostTask(
162 BrowserThread::UI, FROM_HERE, cookies_transfered_callback); 162 BrowserThread::UI, FROM_HERE, cookies_transfered_callback);
163 } 163 }
164 164
165 TransferDefaultAuthCache(from_profile, to_profile); 165 TransferDefaultAuthCache(from_profile, to_profile);
166 } 166 }
167
167 } // namespace chromeos 168 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/profile_auth_data.h ('k') | chrome/browser/chromeos/login/test_login_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698