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

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

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 chrome_http_user_agent_settings_.reset( 489 chrome_http_user_agent_settings_.reset(
490 new ChromeHttpUserAgentSettings(pref_service)); 490 new ChromeHttpUserAgentSettings(pref_service));
491 491
492 // These members are used only for sign in, which is not enabled 492 // These members are used only for sign in, which is not enabled
493 // in incognito mode. So no need to initialize them. 493 // in incognito mode. So no need to initialize them.
494 if (!IsOffTheRecord()) { 494 if (!IsOffTheRecord()) {
495 google_services_user_account_id_.Init( 495 google_services_user_account_id_.Init(
496 prefs::kGoogleServicesUserAccountId, pref_service); 496 prefs::kGoogleServicesUserAccountId, pref_service);
497 google_services_user_account_id_.MoveToThread(io_task_runner); 497 google_services_user_account_id_.MoveToThread(io_task_runner);
498 498
499 sync_disabled_.Init(syncer::prefs::kSyncManaged, pref_service); 499 sync_disabled_.Init(sync_driver::prefs::kSyncManaged, pref_service);
500 sync_disabled_.MoveToThread(io_task_runner); 500 sync_disabled_.MoveToThread(io_task_runner);
501 501
502 signin_allowed_.Init(prefs::kSigninAllowed, pref_service); 502 signin_allowed_.Init(prefs::kSigninAllowed, pref_service);
503 signin_allowed_.MoveToThread(io_task_runner); 503 signin_allowed_.MoveToThread(io_task_runner);
504 } 504 }
505 505
506 if (!IsOffTheRecord()) 506 if (!IsOffTheRecord())
507 media_device_id_salt_ = new MediaDeviceIDSalt(pref_service); 507 media_device_id_salt_ = new MediaDeviceIDSalt(pref_service);
508 508
509 network_prediction_options_.Init(prefs::kNetworkPredictionOptions, 509 network_prediction_options_.Init(prefs::kNetworkPredictionOptions,
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 void ProfileIOData::SetCookieSettingsForTesting( 1377 void ProfileIOData::SetCookieSettingsForTesting(
1378 content_settings::CookieSettings* cookie_settings) { 1378 content_settings::CookieSettings* cookie_settings) {
1379 DCHECK(!cookie_settings_.get()); 1379 DCHECK(!cookie_settings_.get());
1380 cookie_settings_ = cookie_settings; 1380 cookie_settings_ = cookie_settings;
1381 } 1381 }
1382 1382
1383 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1383 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1384 const GURL& url) const { 1384 const GURL& url) const {
1385 return url_blacklist_manager_->GetURLBlacklistState(url); 1385 return url_blacklist_manager_->GetURLBlacklistState(url);
1386 } 1386 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/supervised_user/supervised_user_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698