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

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

Issue 959013002: Remove support in ProfileIOData for one click sign in which is no longer used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocl2
Patch Set: Fix browser tests Created 5 years, 9 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
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 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 466
467 // These members are used only for one click sign in, which is not enabled 467 // These members are used only for one click sign in, which is not enabled
468 // in incognito mode. So no need to initialize them. 468 // in incognito mode. So no need to initialize them.
469 if (!IsOffTheRecord()) { 469 if (!IsOffTheRecord()) {
470 signin_names_.reset(new SigninNamesOnIOThread()); 470 signin_names_.reset(new SigninNamesOnIOThread());
471 471
472 google_services_user_account_id_.Init( 472 google_services_user_account_id_.Init(
473 prefs::kGoogleServicesUserAccountId, pref_service); 473 prefs::kGoogleServicesUserAccountId, pref_service);
474 google_services_user_account_id_.MoveToThread(io_message_loop_proxy); 474 google_services_user_account_id_.MoveToThread(io_message_loop_proxy);
475 475
476 google_services_username_.Init(
477 prefs::kGoogleServicesUsername, pref_service);
478 google_services_username_.MoveToThread(io_message_loop_proxy);
479
480 google_services_username_pattern_.Init(
481 prefs::kGoogleServicesUsernamePattern, local_state_pref_service);
482 google_services_username_pattern_.MoveToThread(io_message_loop_proxy);
483
484 reverse_autologin_enabled_.Init(
485 prefs::kReverseAutologinEnabled, pref_service);
486 reverse_autologin_enabled_.MoveToThread(io_message_loop_proxy);
487
488 one_click_signin_rejected_email_list_.Init(
489 prefs::kReverseAutologinRejectedEmailList, pref_service);
490 one_click_signin_rejected_email_list_.MoveToThread(io_message_loop_proxy);
491
492 sync_disabled_.Init(sync_driver::prefs::kSyncManaged, pref_service); 476 sync_disabled_.Init(sync_driver::prefs::kSyncManaged, pref_service);
493 sync_disabled_.MoveToThread(io_message_loop_proxy); 477 sync_disabled_.MoveToThread(io_message_loop_proxy);
494 478
495 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); 479 signin_allowed_.Init(prefs::kSigninAllowed, pref_service);
496 signin_allowed_.MoveToThread(io_message_loop_proxy); 480 signin_allowed_.MoveToThread(io_message_loop_proxy);
497 } 481 }
498 482
499 quick_check_enabled_.Init(prefs::kQuickCheckEnabled, 483 quick_check_enabled_.Init(prefs::kQuickCheckEnabled,
500 local_state_pref_service); 484 local_state_pref_service);
501 quick_check_enabled_.MoveToThread(io_message_loop_proxy); 485 quick_check_enabled_.MoveToThread(io_message_loop_proxy);
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1239 } 1223 }
1240 1224
1241 void ProfileIOData::ShutdownOnUIThread( 1225 void ProfileIOData::ShutdownOnUIThread(
1242 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters) { 1226 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters) {
1243 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 1227 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
1244 1228
1245 if (signin_names_) 1229 if (signin_names_)
1246 signin_names_->ReleaseResourcesOnUIThread(); 1230 signin_names_->ReleaseResourcesOnUIThread();
1247 1231
1248 google_services_user_account_id_.Destroy(); 1232 google_services_user_account_id_.Destroy();
1249 google_services_username_.Destroy();
1250 google_services_username_pattern_.Destroy();
1251 reverse_autologin_enabled_.Destroy();
1252 one_click_signin_rejected_email_list_.Destroy();
1253 enable_referrers_.Destroy(); 1233 enable_referrers_.Destroy();
1254 enable_do_not_track_.Destroy(); 1234 enable_do_not_track_.Destroy();
1255 force_safesearch_.Destroy(); 1235 force_safesearch_.Destroy();
1256 force_google_safesearch_.Destroy(); 1236 force_google_safesearch_.Destroy();
1257 force_youtube_safety_mode_.Destroy(); 1237 force_youtube_safety_mode_.Destroy();
1258 #if !defined(OS_CHROMEOS) 1238 #if !defined(OS_CHROMEOS)
1259 enable_metrics_.Destroy(); 1239 enable_metrics_.Destroy();
1260 #endif 1240 #endif
1261 safe_browsing_enabled_.Destroy(); 1241 safe_browsing_enabled_.Destroy();
1262 sync_disabled_.Destroy(); 1242 sync_disabled_.Destroy();
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 void ProfileIOData::SetCookieSettingsForTesting( 1322 void ProfileIOData::SetCookieSettingsForTesting(
1343 CookieSettings* cookie_settings) { 1323 CookieSettings* cookie_settings) {
1344 DCHECK(!cookie_settings_.get()); 1324 DCHECK(!cookie_settings_.get());
1345 cookie_settings_ = cookie_settings; 1325 cookie_settings_ = cookie_settings;
1346 } 1326 }
1347 1327
1348 void ProfileIOData::set_signin_names_for_testing( 1328 void ProfileIOData::set_signin_names_for_testing(
1349 SigninNamesOnIOThread* signin_names) { 1329 SigninNamesOnIOThread* signin_names) {
1350 signin_names_.reset(signin_names); 1330 signin_names_.reset(signin_names);
1351 } 1331 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/signin/signin_header_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698