chrome/browser/chromeos/settings/cros_settings.cc - Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/settings/cros_settings.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 4 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 | Annotate | Revision Log

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/settings/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/device_settings_provider.h"	13 #include "chrome/browser/chromeos/settings/device_settings_provider.h"

14 #include "chrome/browser/chromeos/login/signed_settings_helper.h"	14 #include "chrome/browser/chromeos/settings/signed_settings_helper.h"

15 #include "chrome/browser/chromeos/stub_cros_settings_provider.h"	15 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

16 #include "chrome/browser/chromeos/system_settings_provider.h"	16 #include "chrome/browser/chromeos/settings/system_settings_provider.h"

17 #include "chrome/common/chrome_notification_types.h"	17 #include "chrome/common/chrome_notification_types.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/net/gaia/gaia_auth_util.h"	19 #include "chrome/common/net/gaia/gaia_auth_util.h"

20 #include "content/public/browser/notification_details.h"	20 #include "content/public/browser/notification_details.h"

21 #include "content/public/browser/notification_source.h"	21 #include "content/public/browser/notification_source.h"

22 #include "content/public/browser/notification_types.h"	22 #include "content/public/browser/notification_types.h"

23	23

24 namespace chromeos {	24 namespace chromeos {

25	25

26 static base::LazyInstance<CrosSettings> g_cros_settings =	26 static base::LazyInstance<CrosSettings> g_cros_settings =

(...skipping 279 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306 // System settings are not mocked currently.	306 // System settings are not mocked currently.

307 AddSettingsProvider(new SystemSettingsProvider(notify_cb));	307 AddSettingsProvider(new SystemSettingsProvider(notify_cb));

308 }	308 }

309	309

310 CrosSettings::~CrosSettings() {	310 CrosSettings::~CrosSettings() {

311 STLDeleteElements(&providers_);	311 STLDeleteElements(&providers_);

312 STLDeleteValues(&settings_observers_);	312 STLDeleteValues(&settings_observers_);

313 }	313 }

314	314

315 } // namespace chromeos	315 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings.h ('k') | chrome/browser/chromeos/settings/cros_settings_names.h » ('j') | no next file with comments »