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

Side by Side Diff: chrome/browser/policy/policy_loader_win.cc

Issue 22807004: Moved chrome/common/json_schema to components/json_schema. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed android isolates Created 7 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/DEPS ('k') | chrome/browser/policy/policy_loader_win_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/policy/policy_loader_win.h" 5 #include "chrome/browser/policy/policy_loader_win.h"
6 6
7 #include <rpc.h> // For struct GUID 7 #include <rpc.h> // For struct GUID
8 #include <shlwapi.h> // For PathIsUNC() 8 #include <shlwapi.h> // For PathIsUNC()
9 #include <userenv.h> // For GPO functions 9 #include <userenv.h> // For GPO functions
10 #include <windows.h> 10 #include <windows.h>
(...skipping 13 matching lines...) Expand all
24 #include "base/logging.h" 24 #include "base/logging.h"
25 #include "base/scoped_native_library.h" 25 #include "base/scoped_native_library.h"
26 #include "base/stl_util.h" 26 #include "base/stl_util.h"
27 #include "base/strings/string16.h" 27 #include "base/strings/string16.h"
28 #include "base/strings/string_util.h" 28 #include "base/strings/string_util.h"
29 #include "chrome/browser/policy/policy_bundle.h" 29 #include "chrome/browser/policy/policy_bundle.h"
30 #include "chrome/browser/policy/policy_load_status.h" 30 #include "chrome/browser/policy/policy_load_status.h"
31 #include "chrome/browser/policy/policy_map.h" 31 #include "chrome/browser/policy/policy_map.h"
32 #include "chrome/browser/policy/preg_parser_win.h" 32 #include "chrome/browser/policy/preg_parser_win.h"
33 #include "chrome/browser/policy/registry_dict_win.h" 33 #include "chrome/browser/policy/registry_dict_win.h"
34 #include "chrome/common/json_schema/json_schema_constants.h" 34 #include "components/json_schema/json_schema_constants.h"
35 #include "policy/policy_constants.h" 35 #include "policy/policy_constants.h"
36 36
37 namespace schema = json_schema_constants; 37 namespace schema = json_schema_constants;
38 38
39 namespace policy { 39 namespace policy {
40 40
41 namespace { 41 namespace {
42 42
43 const char kKeyMandatory[] = "policy"; 43 const char kKeyMandatory[] = "policy";
44 const char kKeyRecommended[] = "recommended"; 44 const char kKeyRecommended[] = "recommended";
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 524
525 void PolicyLoaderWin::OnObjectSignaled(HANDLE object) { 525 void PolicyLoaderWin::OnObjectSignaled(HANDLE object) {
526 DCHECK(object == user_policy_changed_event_.handle() || 526 DCHECK(object == user_policy_changed_event_.handle() ||
527 object == machine_policy_changed_event_.handle()) 527 object == machine_policy_changed_event_.handle())
528 << "unexpected object signaled policy reload, obj = " 528 << "unexpected object signaled policy reload, obj = "
529 << std::showbase << std::hex << object; 529 << std::showbase << std::hex << object;
530 Reload(false); 530 Reload(false);
531 } 531 }
532 532
533 } // namespace policy 533 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/policy/policy_loader_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698