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

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

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 #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_ 5 #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_
6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_ 6 #define IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
12 #include "ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h" 12 #include "ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.h"
13 13
14 namespace ssl_config { 14 namespace ssl_config {
15 class SSLConfigServiceManager; 15 class SSLConfigServiceManager;
16 } 16 }
17 17
18 namespace syncable_prefs { 18 namespace sync_preferences {
19 class PrefServiceSyncable; 19 class PrefServiceSyncable;
20 } 20 }
21 21
22 namespace user_prefs { 22 namespace user_prefs {
23 class PrefRegistrySyncable; 23 class PrefRegistrySyncable;
24 } 24 }
25 25
26 class PrefProxyConfigTracker; 26 class PrefProxyConfigTracker;
27 27
28 // This class is the implementation of ChromeBrowserState used for 28 // This class is the implementation of ChromeBrowserState used for
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 // !!! BIG HONKING WARNING !!! 74 // !!! BIG HONKING WARNING !!!
75 // The order of the members below is important. Do not change it unless 75 // The order of the members below is important. Do not change it unless
76 // you know what you're doing. Also, if adding a new member here make sure 76 // you know what you're doing. Also, if adding a new member here make sure
77 // that the declaration occurs AFTER things it depends on as destruction 77 // that the declaration occurs AFTER things it depends on as destruction
78 // happens in reverse order of declaration. 78 // happens in reverse order of declaration.
79 79
80 // Keep |prefs_| on top for destruction order because |io_data_| and others 80 // Keep |prefs_| on top for destruction order because |io_data_| and others
81 // store pointers to |prefs_| and shall be destructed first. 81 // store pointers to |prefs_| and shall be destructed first.
82 scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_; 82 scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
83 std::unique_ptr<syncable_prefs::PrefServiceSyncable> prefs_; 83 std::unique_ptr<sync_preferences::PrefServiceSyncable> prefs_;
84 std::unique_ptr<syncable_prefs::PrefServiceSyncable> otr_prefs_; 84 std::unique_ptr<sync_preferences::PrefServiceSyncable> otr_prefs_;
85 std::unique_ptr<ChromeBrowserStateImplIOData::Handle> io_data_; 85 std::unique_ptr<ChromeBrowserStateImplIOData::Handle> io_data_;
86 86
87 std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 87 std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
88 std::unique_ptr<ssl_config::SSLConfigServiceManager> 88 std::unique_ptr<ssl_config::SSLConfigServiceManager>
89 ssl_config_service_manager_; 89 ssl_config_service_manager_;
90 90
91 // STOP!!!! DO NOT ADD ANY MORE ITEMS HERE!!!! 91 // STOP!!!! DO NOT ADD ANY MORE ITEMS HERE!!!!
92 // 92 //
93 // Instead, make your Service/Manager/whatever object you're hanging off the 93 // Instead, make your Service/Manager/whatever object you're hanging off the
94 // BrowserState use our BrowserStateKeyedServiceFactory system instead. 94 // BrowserState use our BrowserStateKeyedServiceFactory system instead.
95 // You can find the design document here: 95 // You can find the design document here:
96 // 96 //
97 // https://sites.google.com/a/chromium.org/dev/developers/design-documents/p rofile-architecture 97 // https://sites.google.com/a/chromium.org/dev/developers/design-documents/p rofile-architecture
98 // 98 //
99 // and you can read the raw headers here: 99 // and you can read the raw headers here:
100 // 100 //
101 // components/keyed_service/ios/browser_state_dependency_manager.* 101 // components/keyed_service/ios/browser_state_dependency_manager.*
102 // components/keyed_service/core/keyed_service.h 102 // components/keyed_service/core/keyed_service.h
103 // components/keyed_service/ios/browser_state_keyed_service_factory.* 103 // components/keyed_service/ios/browser_state_keyed_service_factory.*
104 104
105 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateImpl); 105 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserStateImpl);
106 }; 106 };
107 107
108 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_ 108 #endif // IOS_CHROME_BROWSER_BROWSER_STATE_CHROME_BROWSER_STATE_IMPL_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698