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

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

Issue 11938007: Don't use request user data during one-click sign in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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/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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 google_services_username_.MoveToThread(io_message_loop_proxy); 210 google_services_username_.MoveToThread(io_message_loop_proxy);
211 211
212 google_services_username_pattern_.Init( 212 google_services_username_pattern_.Init(
213 prefs::kGoogleServicesUsernamePattern, local_state_pref_service); 213 prefs::kGoogleServicesUsernamePattern, local_state_pref_service);
214 google_services_username_pattern_.MoveToThread(io_message_loop_proxy); 214 google_services_username_pattern_.MoveToThread(io_message_loop_proxy);
215 215
216 reverse_autologin_enabled_.Init( 216 reverse_autologin_enabled_.Init(
217 prefs::kReverseAutologinEnabled, pref_service); 217 prefs::kReverseAutologinEnabled, pref_service);
218 reverse_autologin_enabled_.MoveToThread(io_message_loop_proxy); 218 reverse_autologin_enabled_.MoveToThread(io_message_loop_proxy);
219 219
220 reverse_autologin_pending_email_.Init(
221 prefs::kReverseAutologinPendingEmail, pref_service);
222 reverse_autologin_pending_email_.MoveToThread(io_message_loop_proxy);
223
220 one_click_signin_rejected_email_list_.Init( 224 one_click_signin_rejected_email_list_.Init(
221 prefs::kReverseAutologinRejectedEmailList, pref_service); 225 prefs::kReverseAutologinRejectedEmailList, pref_service);
222 one_click_signin_rejected_email_list_.MoveToThread(io_message_loop_proxy); 226 one_click_signin_rejected_email_list_.MoveToThread(io_message_loop_proxy);
223 227
224 sync_disabled_.Init(prefs::kSyncManaged, pref_service); 228 sync_disabled_.Init(prefs::kSyncManaged, pref_service);
225 sync_disabled_.MoveToThread(io_message_loop_proxy); 229 sync_disabled_.MoveToThread(io_message_loop_proxy);
226 } 230 }
227 231
228 // The URLBlacklistManager has to be created on the UI thread to register 232 // The URLBlacklistManager has to be created on the UI thread to register
229 // observers of |pref_service|, and it also has to clean up on 233 // observers of |pref_service|, and it also has to clean up on
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 673
670 void ProfileIOData::ShutdownOnUIThread() { 674 void ProfileIOData::ShutdownOnUIThread() {
671 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 675 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
672 676
673 if (signin_names_) 677 if (signin_names_)
674 signin_names_->ReleaseResourcesOnUIThread(); 678 signin_names_->ReleaseResourcesOnUIThread();
675 679
676 google_services_username_.Destroy(); 680 google_services_username_.Destroy();
677 google_services_username_pattern_.Destroy(); 681 google_services_username_pattern_.Destroy();
678 reverse_autologin_enabled_.Destroy(); 682 reverse_autologin_enabled_.Destroy();
683 reverse_autologin_pending_email_.Destroy();
679 one_click_signin_rejected_email_list_.Destroy(); 684 one_click_signin_rejected_email_list_.Destroy();
680 enable_referrers_.Destroy(); 685 enable_referrers_.Destroy();
681 enable_do_not_track_.Destroy(); 686 enable_do_not_track_.Destroy();
682 force_safesearch_.Destroy(); 687 force_safesearch_.Destroy();
683 #if !defined(OS_CHROMEOS) 688 #if !defined(OS_CHROMEOS)
684 enable_metrics_.Destroy(); 689 enable_metrics_.Destroy();
685 #endif 690 #endif
686 safe_browsing_enabled_.Destroy(); 691 safe_browsing_enabled_.Destroy();
687 printing_enabled_.Destroy(); 692 printing_enabled_.Destroy();
688 sync_disabled_.Destroy(); 693 sync_disabled_.Destroy();
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 void ProfileIOData::SetCookieSettingsForTesting( 738 void ProfileIOData::SetCookieSettingsForTesting(
734 CookieSettings* cookie_settings) { 739 CookieSettings* cookie_settings) {
735 DCHECK(!cookie_settings_.get()); 740 DCHECK(!cookie_settings_.get());
736 cookie_settings_ = cookie_settings; 741 cookie_settings_ = cookie_settings;
737 } 742 }
738 743
739 void ProfileIOData::set_signin_names_for_testing( 744 void ProfileIOData::set_signin_names_for_testing(
740 SigninNamesOnIOThread* signin_names) { 745 SigninNamesOnIOThread* signin_names) {
741 signin_names_.reset(signin_names); 746 signin_names_.reset(signin_names);
742 } 747 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698