| Index: chrome/browser/policy/policy_loader_win.cc
|
| diff --git a/chrome/browser/policy/policy_loader_win.cc b/chrome/browser/policy/policy_loader_win.cc
|
| index 2abbeebb2b498fa9715549cd3b9aaf077e29e6c7..3691a7600f5d172bb6c21d117b2743ff4b0dc2df 100644
|
| --- a/chrome/browser/policy/policy_loader_win.cc
|
| +++ b/chrome/browser/policy/policy_loader_win.cc
|
| @@ -4,14 +4,14 @@
|
|
|
| #include "chrome/browser/policy/policy_loader_win.h"
|
|
|
| -#include <string>
|
| -#include <vector>
|
| -
|
| #include <rpc.h> // For struct GUID
|
| #include <shlwapi.h> // For PathIsUNC()
|
| #include <userenv.h> // For GPO functions
|
| #include <windows.h>
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| // shlwapi.dll is required for PathIsUNC().
|
| #pragma comment(lib, "shlwapi.lib")
|
| // userenv.dll is required for various GPO functions.
|
| @@ -19,7 +19,6 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/file_util.h"
|
| -#include "base/files/file_path.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| @@ -55,10 +54,6 @@ const char kKeyThirdParty[] = "3rdparty";
|
| // The GUID of the registry settings group policy extension.
|
| GUID kRegistrySettingsCSEGUID = REGISTRY_EXTENSION_GUID;
|
|
|
| -// The PReg file name.
|
| -const base::FilePath::CharType kPRegFileName[] =
|
| - FILE_PATH_LITERAL("Registry.pol");
|
| -
|
| // A helper class encapsulating run-time-linked function calls to Wow64 APIs.
|
| class Wow64Functions {
|
| public:
|
| @@ -449,6 +444,9 @@ void ParsePolicy(const base::DictionaryValue* gpo_dict,
|
|
|
| } // namespace
|
|
|
| +const base::FilePath::CharType PolicyLoaderWin::kPRegFileName[] =
|
| + FILE_PATH_LITERAL("Registry.pol");
|
| +
|
| PolicyLoaderWin::PolicyLoaderWin(const PolicyDefinitionList* policy_list,
|
| const string16& chrome_policy_key,
|
| AppliedGPOListProvider* gpo_provider)
|
|
|