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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state.mm

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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.h" 5 #include "ios/chrome/browser/browser_state/chrome_browser_state.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/logging.h" 10 #include "base/logging.h"
11 #include "base/sequenced_task_runner.h" 11 #include "base/sequenced_task_runner.h"
12 #include "components/prefs/json_pref_store.h" 12 #include "components/prefs/json_pref_store.h"
13 #include "components/syncable_prefs/pref_service_syncable.h" 13 #include "components/sync_preferences/pref_service_syncable.h"
14 #include "ios/chrome/browser/chrome_url_constants.h" 14 #include "ios/chrome/browser/chrome_url_constants.h"
15 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h" 15 #include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"
16 #include "ios/chrome/browser/net/net_types.h" 16 #include "ios/chrome/browser/net/net_types.h"
17 #include "ios/web/public/web_state/web_state.h" 17 #include "ios/web/public/web_state/web_state.h"
18 #include "ios/web/public/web_thread.h" 18 #include "ios/web/public/web_thread.h"
19 #include "ios/web/public/webui/web_ui_ios.h" 19 #include "ios/web/public/webui/web_ui_ios.h"
20 #include "ios/web/webui/url_data_manager_ios_backend.h" 20 #include "ios/web/webui/url_data_manager_ios_backend.h"
21 #include "net/url_request/url_request_interceptor.h" 21 #include "net/url_request/url_request_interceptor.h"
22 22
23 namespace ios { 23 namespace ios {
(...skipping 25 matching lines...) Expand all
49 return name; 49 return name;
50 } 50 }
51 51
52 scoped_refptr<base::SequencedTaskRunner> ChromeBrowserState::GetIOTaskRunner() { 52 scoped_refptr<base::SequencedTaskRunner> ChromeBrowserState::GetIOTaskRunner() {
53 base::FilePath browser_state_path = 53 base::FilePath browser_state_path =
54 GetOriginalChromeBrowserState()->GetStatePath(); 54 GetOriginalChromeBrowserState()->GetStatePath();
55 return JsonPrefStore::GetTaskRunnerForFile(browser_state_path, 55 return JsonPrefStore::GetTaskRunnerForFile(browser_state_path,
56 web::WebThread::GetBlockingPool()); 56 web::WebThread::GetBlockingPool());
57 } 57 }
58 58
59 syncable_prefs::PrefServiceSyncable* ChromeBrowserState::GetSyncablePrefs() { 59 sync_preferences::PrefServiceSyncable* ChromeBrowserState::GetSyncablePrefs() {
60 return static_cast<syncable_prefs::PrefServiceSyncable*>(GetPrefs()); 60 return static_cast<sync_preferences::PrefServiceSyncable*>(GetPrefs());
61 } 61 }
62 62
63 TestChromeBrowserState* ChromeBrowserState::AsTestChromeBrowserState() { 63 TestChromeBrowserState* ChromeBrowserState::AsTestChromeBrowserState() {
64 return nullptr; 64 return nullptr;
65 } 65 }
66 66
67 net::URLRequestContextGetter* ChromeBrowserState::GetRequestContext() { 67 net::URLRequestContextGetter* ChromeBrowserState::GetRequestContext() {
68 DCHECK_CURRENTLY_ON(web::WebThread::UI); 68 DCHECK_CURRENTLY_ON(web::WebThread::UI);
69 if (!request_context_getter_) { 69 if (!request_context_getter_) {
70 ProtocolHandlerMap protocol_handlers; 70 ProtocolHandlerMap protocol_handlers;
71 protocol_handlers[kChromeUIScheme] = 71 protocol_handlers[kChromeUIScheme] =
72 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>( 72 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
73 web::URLDataManagerIOSBackend::CreateProtocolHandler(this) 73 web::URLDataManagerIOSBackend::CreateProtocolHandler(this)
74 .release()); 74 .release());
75 URLRequestInterceptorScopedVector request_interceptors; 75 URLRequestInterceptorScopedVector request_interceptors;
76 request_context_getter_ = make_scoped_refptr(CreateRequestContext( 76 request_context_getter_ = make_scoped_refptr(CreateRequestContext(
77 &protocol_handlers, std::move(request_interceptors))); 77 &protocol_handlers, std::move(request_interceptors)));
78 } 78 }
79 return request_context_getter_.get(); 79 return request_context_getter_.get();
80 } 80 }
81 81
82 } // namespace ios 82 } // namespace ios
OLDNEW
« no previous file with comments | « ios/chrome/browser/browser_state/chrome_browser_state.h ('k') | ios/chrome/browser/browser_state/chrome_browser_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698