chrome/browser/policy/config_dir_policy_loader.h - Issue 10917266: Rename "chrome/browser/policy/policy_constants.h" so that it doesn't clash with the generated "poli…

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/policy/config_dir_policy_loader.h

Issue 10917266: Rename "chrome/browser/policy/policy_constants.h" so that it doesn't clash with the generated "poli… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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/policy/cloud_policy_client.h ('k') | chrome/browser/policy/configuration_policy_provider_test.h » ('j') | no next file with comments »

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_POLICY_CONFIG_DIR_POLICY_LOADER_H_	5 #ifndef CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_

6 #define CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_	6 #define CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_

7	7

8 #include "base/file_path.h"	8 #include "base/file_path.h"

9 #include "base/files/file_path_watcher.h"	9 #include "base/files/file_path_watcher.h"

10 #include "chrome/browser/policy/async_policy_loader.h"	10 #include "chrome/browser/policy/async_policy_loader.h"

11 #include "chrome/browser/policy/policy_constants.h"	11 #include "chrome/browser/policy/policy_types.h"

12	12

13 namespace base {	13 namespace base {

14 class Value;	14 class Value;

15 }	15 }

16	16

17 namespace policy {	17 namespace policy {

18	18

19 // A policy loader implementation backed by a set of files in a given	19 // A policy loader implementation backed by a set of files in a given

20 // directory. The files should contain JSON-formatted policy settings. They are	20 // directory. The files should contain JSON-formatted policy settings. They are

21 // merged together and the result is returned in a PolicyBundle.	21 // merged together and the result is returned in a PolicyBundle.

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 // \|config_dir_\|.	55 // \|config_dir_\|.

56 base::files::FilePathWatcher mandatory_watcher_;	56 base::files::FilePathWatcher mandatory_watcher_;

57 base::files::FilePathWatcher recommended_watcher_;	57 base::files::FilePathWatcher recommended_watcher_;

58	58

59 DISALLOW_COPY_AND_ASSIGN(ConfigDirPolicyLoader);	59 DISALLOW_COPY_AND_ASSIGN(ConfigDirPolicyLoader);

60 };	60 };

61	61

62 } // namespace policy	62 } // namespace policy

63	63

64 #endif // CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_	64 #endif // CHROME_BROWSER_POLICY_CONFIG_DIR_POLICY_LOADER_H_

OLD	NEW