ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc - Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.h ('k') | ios/chrome/browser/browser_state/test_chrome_browser_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

index 71e2b3ad22522a524bdbc892c4ab136a54cfb7d2..6a4e893020d9b889095414b7a9eff4054fbdc7b3 100644

--- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

+++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.cc

@@ -7,7 +7,7 @@

#include "base/logging.h"

#include "components/keyed_service/ios/browser_state_dependency_manager.h"

#include "components/proxy_config/pref_proxy_config_tracker.h"

-#include "components/syncable_prefs/pref_service_syncable.h"

+#include "components/sync_preferences/pref_service_syncable.h"

#include "components/user_prefs/user_prefs.h"

#include "ios/chrome/browser/application_context.h"

#include "ios/chrome/browser/net/ios_chrome_url_request_context_getter.h"

@@ -19,7 +19,7 @@ OffTheRecordChromeBrowserStateImpl::OffTheRecordChromeBrowserStateImpl(

const base::FilePath& otr_path)

: otr_state_path_(otr_path),

original_chrome_browser_state_(original_chrome_browser_state),

- prefs_(static_cast<syncable_prefs::PrefServiceSyncable*>(

+ prefs_(static_cast<sync_preferences::PrefServiceSyncable*>(

original_chrome_browser_state->GetOffTheRecordPrefs())) {

user_prefs::UserPrefs::Set(this, GetPrefs());

io_data_.reset(new OffTheRecordChromeBrowserStateIOData::Handle(this));