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

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

« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #ifndef CHROME_BROWSER_CHROMEOS_DEVICE_SETTINGS_PROVIDER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_

6 #define CHROME_BROWSER_CHROMEOS_DEVICE_SETTINGS_PROVIDER_H_	6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_

7	7

8 #include <string>	8 #include <string>

9 #include <utility>	9 #include <utility>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/basictypes.h"	12 #include "base/basictypes.h"

13 #include "base/callback_forward.h"	13 #include "base/callback_forward.h"

14 #include "chrome/browser/chromeos/cros_settings_provider.h"	14 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"

15 #include "chrome/browser/chromeos/login/ownership_service.h"	15 #include "chrome/browser/chromeos/settings/ownership_service.h"

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

17 #include "chrome/browser/policy/proto/device_management_backend.pb.h"	17 #include "chrome/browser/policy/proto/device_management_backend.pb.h"

18 #include "chrome/browser/prefs/pref_value_map.h"	18 #include "chrome/browser/prefs/pref_value_map.h"

19 #include "content/public/browser/notification_registrar.h"	19 #include "content/public/browser/notification_registrar.h"

20	20

21 namespace base {	21 namespace base {

22 class Value;	22 class Value;

23 }	23 }

24	24

25 namespace enterprise_management {	25 namespace enterprise_management {

26 class ChromeDeviceSettingsProto;	26 class ChromeDeviceSettingsProto;

(...skipping 136 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,	163 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,

164 InitializationTestUnowned);	164 InitializationTestUnowned);

165 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,	165 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,

166 PolicyFailedPermanentlyNotification);	166 PolicyFailedPermanentlyNotification);

167 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, PolicyLoadNotification);	167 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, PolicyLoadNotification);

168 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);	168 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);

169 };	169 };

170	170

171 } // namespace chromeos	171 } // namespace chromeos

172	172

173 #endif // CHROME_BROWSER_CHROMEOS_DEVICE_SETTINGS_PROVIDER_H_	173 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_

OLD	NEW