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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 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 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // Whether profile still needs to be initialized. 171 // Whether profile still needs to be initialized.
172 bool waiting_for_profile_creation_; 172 bool waiting_for_profile_creation_;
173 173
174 // Whether TPM token still needs to be initialized. 174 // Whether TPM token still needs to be initialized.
175 bool waiting_for_tpm_token_; 175 bool waiting_for_tpm_token_;
176 176
177 // True if local-owner policy fixups are still pending. 177 // True if local-owner policy fixups are still pending.
178 bool has_pending_fixups_; 178 bool has_pending_fixups_;
179 179
180 // A set of pending changes to device settings. 180 // A set of pending changes to device settings.
181 base::ScopedPtrHashMap<std::string, base::Value> pending_changes_; 181 base::ScopedPtrHashMap<std::string, scoped_ptr<base::Value>> pending_changes_;
182 182
183 // True if there're pending changes to management settings. 183 // True if there're pending changes to management settings.
184 bool has_pending_management_settings_; 184 bool has_pending_management_settings_;
185 185
186 // A set of pending changes to management settings. 186 // A set of pending changes to management settings.
187 ManagementSettings pending_management_settings_; 187 ManagementSettings pending_management_settings_;
188 188
189 // A set of callbacks that need to be run after management settings 189 // A set of callbacks that need to be run after management settings
190 // are set and policy is stored. 190 // are set and policy is stored.
191 std::vector<OnManagementSettingsSetCallback> 191 std::vector<OnManagementSettingsSetCallback>
192 pending_management_settings_callbacks_; 192 pending_management_settings_callbacks_;
193 193
194 // A protobuf containing pending changes to device settings. 194 // A protobuf containing pending changes to device settings.
195 scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> 195 scoped_ptr<enterprise_management::ChromeDeviceSettingsProto>
196 tentative_settings_; 196 tentative_settings_;
197 197
198 content::NotificationRegistrar registrar_; 198 content::NotificationRegistrar registrar_;
199 199
200 base::WeakPtrFactory<OwnerSettingsServiceChromeOS> weak_factory_; 200 base::WeakPtrFactory<OwnerSettingsServiceChromeOS> weak_factory_;
201 201
202 base::WeakPtrFactory<OwnerSettingsServiceChromeOS> store_settings_factory_; 202 base::WeakPtrFactory<OwnerSettingsServiceChromeOS> store_settings_factory_;
203 203
204 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOS); 204 DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOS);
205 }; 205 };
206 206
207 } // namespace chromeos 207 } // namespace chromeos
208 208
209 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_ 209 #endif // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/wake_on_wifi_manager.h ('k') | chrome/browser/chromeos/power/extension_event_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698