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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_impl.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ios/chrome/browser/browser_state/chrome_browser_state_impl.h" 5 #include "ios/chrome/browser/browser_state/chrome_browser_state_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "components/bookmarks/browser/bookmark_model.h" 13 #include "components/bookmarks/browser/bookmark_model.h"
14 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 14 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
15 #include "components/pref_registry/pref_registry_syncable.h" 15 #include "components/pref_registry/pref_registry_syncable.h"
16 #include "components/prefs/json_pref_store.h" 16 #include "components/prefs/json_pref_store.h"
17 #include "components/prefs/pref_service.h" 17 #include "components/prefs/pref_service.h"
18 #include "components/proxy_config/pref_proxy_config_tracker.h" 18 #include "components/proxy_config/pref_proxy_config_tracker.h"
19 #include "components/syncable_prefs/pref_service_syncable.h" 19 #include "components/sync_preferences/pref_service_syncable.h"
20 #include "components/user_prefs/user_prefs.h" 20 #include "components/user_prefs/user_prefs.h"
21 #include "ios/chrome/browser/application_context.h" 21 #include "ios/chrome/browser/application_context.h"
22 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" 22 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
23 #include "ios/chrome/browser/browser_state/bookmark_model_loaded_observer.h" 23 #include "ios/chrome/browser/browser_state/bookmark_model_loaded_observer.h"
24 #include "ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_i mpl.h" 24 #include "ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_i mpl.h"
25 #include "ios/chrome/browser/chrome_constants.h" 25 #include "ios/chrome/browser/chrome_constants.h"
26 #include "ios/chrome/browser/chrome_paths_internal.h" 26 #include "ios/chrome/browser/chrome_paths_internal.h"
27 #include "ios/chrome/browser/file_metadata_util.h" 27 #include "ios/chrome/browser/file_metadata_util.h"
28 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h" 28 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
29 #include "ios/chrome/browser/net/proxy_service_factory.h" 29 #include "ios/chrome/browser/net/proxy_service_factory.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 net::SSLConfigService* ChromeBrowserStateImpl::GetSSLConfigService() { 253 net::SSLConfigService* ChromeBrowserStateImpl::GetSSLConfigService() {
254 // If ssl_config_service_manager_ is null, this typically means that some 254 // If ssl_config_service_manager_ is null, this typically means that some
255 // KeyedService is trying to create a RequestContext at startup, 255 // KeyedService is trying to create a RequestContext at startup,
256 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 256 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
257 // invoked after all KeyedServices have been initialized (see 257 // invoked after all KeyedServices have been initialized (see
258 // http://crbug.com/171406). 258 // http://crbug.com/171406).
259 DCHECK(ssl_config_service_manager_) 259 DCHECK(ssl_config_service_manager_)
260 << "SSLConfigServiceManager is not initialized yet"; 260 << "SSLConfigServiceManager is not initialized yet";
261 return ssl_config_service_manager_->Get(); 261 return ssl_config_service_manager_->Get();
262 } 262 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698