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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_provider.h

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
OLDNEW
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_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/callback_forward.h" 14 #include "base/callback_forward.h"
15 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/prefs/pref_value_map.h" 17 #include "base/prefs/pref_value_map.h"
18 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
19 #include "chrome/browser/chromeos/settings/cros_settings_provider.h" 18 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
20 #include "chrome/browser/chromeos/settings/device_settings_service.h" 19 #include "chrome/browser/chromeos/settings/device_settings_service.h"
20 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
21 21
22 namespace base { 22 namespace base {
23 class Value; 23 class Value;
24 } 24 }
25 25
26 namespace enterprise_management { 26 namespace enterprise_management {
27 class ChromeDeviceSettingsProto; 27 class ChromeDeviceSettingsProto;
28 } // namespace enterprise_management 28 } // namespace enterprise_management
29 29
30 namespace chromeos { 30 namespace chromeos {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 InitializationTestUnowned); 160 InitializationTestUnowned);
161 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, 161 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,
162 PolicyFailedPermanentlyNotification); 162 PolicyFailedPermanentlyNotification);
163 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, PolicyLoadNotification); 163 FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest, PolicyLoadNotification);
164 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider); 164 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);
165 }; 165 };
166 166
167 } // namespace chromeos 167 } // namespace chromeos
168 168
169 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_ 169 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698