OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/cros_settings.h" | 5 #include "chrome/browser/chromeos/cros_settings.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/chromeos/cros_settings_provider.h" | 13 #include "chrome/browser/chromeos/cros_settings_provider.h" |
14 #include "chrome/browser/chromeos/device_settings_provider.h" | 14 #include "chrome/browser/chromeos/device_settings_provider.h" |
| 15 #include "chrome/browser/chromeos/login/signed_settings_helper.h" |
15 #include "chrome/browser/chromeos/stub_cros_settings_provider.h" | 16 #include "chrome/browser/chromeos/stub_cros_settings_provider.h" |
16 #include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h" | 17 #include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h" |
17 #include "chrome/common/chrome_notification_types.h" | 18 #include "chrome/common/chrome_notification_types.h" |
18 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
19 #include "content/public/browser/notification_details.h" | 20 #include "content/public/browser/notification_details.h" |
20 #include "content/public/browser/notification_source.h" | 21 #include "content/public/browser/notification_source.h" |
21 #include "content/public/browser/notification_types.h" | 22 #include "content/public/browser/notification_types.h" |
22 | 23 |
23 namespace chromeos { | 24 namespace chromeos { |
24 | 25 |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 | 275 |
275 CrosSettings::CrosSettings() { | 276 CrosSettings::CrosSettings() { |
276 CrosSettingsProvider::NotifyObserversCallback notify_cb( | 277 CrosSettingsProvider::NotifyObserversCallback notify_cb( |
277 base::Bind(&CrosSettings::FireObservers, | 278 base::Bind(&CrosSettings::FireObservers, |
278 // This is safe since |this| is never deleted. | 279 // This is safe since |this| is never deleted. |
279 base::Unretained(this))); | 280 base::Unretained(this))); |
280 if (CommandLine::ForCurrentProcess()->HasSwitch( | 281 if (CommandLine::ForCurrentProcess()->HasSwitch( |
281 switches::kStubCrosSettings)) { | 282 switches::kStubCrosSettings)) { |
282 AddSettingsProvider(new StubCrosSettingsProvider(notify_cb)); | 283 AddSettingsProvider(new StubCrosSettingsProvider(notify_cb)); |
283 } else { | 284 } else { |
284 AddSettingsProvider(new DeviceSettingsProvider(notify_cb)); | 285 AddSettingsProvider( |
| 286 new DeviceSettingsProvider(notify_cb, SignedSettingsHelper::Get())); |
285 } | 287 } |
286 // System settings are not mocked currently. | 288 // System settings are not mocked currently. |
287 AddSettingsProvider(new options2::SystemSettingsProvider(notify_cb)); | 289 AddSettingsProvider(new options2::SystemSettingsProvider(notify_cb)); |
288 } | 290 } |
289 | 291 |
290 CrosSettings::~CrosSettings() { | 292 CrosSettings::~CrosSettings() { |
291 STLDeleteElements(&providers_); | 293 STLDeleteElements(&providers_); |
292 STLDeleteValues(&settings_observers_); | 294 STLDeleteValues(&settings_observers_); |
293 } | 295 } |
294 | 296 |
295 } // namespace chromeos | 297 } // namespace chromeos |
OLD | NEW |