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/device_settings_provider.h" | 14 #include "chrome/browser/chromeos/device_settings_provider.h" |
14 #include "chrome/browser/chromeos/stub_cros_settings_provider.h" | 15 #include "chrome/browser/chromeos/stub_cros_settings_provider.h" |
15 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h" | 16 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h" |
16 #include "chrome/common/chrome_notification_types.h" | 17 #include "chrome/common/chrome_notification_types.h" |
17 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
18 #include "content/public/browser/notification_details.h" | 19 #include "content/public/browser/notification_details.h" |
19 #include "content/public/browser/notification_source.h" | 20 #include "content/public/browser/notification_source.h" |
20 #include "content/public/browser/notification_types.h" | 21 #include "content/public/browser/notification_types.h" |
21 | 22 |
22 namespace chromeos { | 23 namespace chromeos { |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 // System settings are not mocked currently. | 287 // System settings are not mocked currently. |
287 AddSettingsProvider(new SystemSettingsProvider(notify_cb)); | 288 AddSettingsProvider(new SystemSettingsProvider(notify_cb)); |
288 } | 289 } |
289 | 290 |
290 CrosSettings::~CrosSettings() { | 291 CrosSettings::~CrosSettings() { |
291 STLDeleteElements(&providers_); | 292 STLDeleteElements(&providers_); |
292 STLDeleteValues(&settings_observers_); | 293 STLDeleteValues(&settings_observers_); |
293 } | 294 } |
294 | 295 |
295 } // namespace chromeos | 296 } // namespace chromeos |
OLD | NEW |