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

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

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chrome_browser_policy_connector.h" 5 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/sys_string_conversions.h" 15 #include "base/strings/sys_string_conversions.h"
16 #include "build/build_config.h"
16 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h" 17 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
17 #include "chrome/browser/policy/device_management_service_configuration.h" 18 #include "chrome/browser/policy/device_management_service_configuration.h"
18 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
19 #include "components/policy/core/common/async_policy_provider.h" 20 #include "components/policy/core/common/async_policy_provider.h"
20 #include "components/policy/core/common/cloud/device_management_service.h" 21 #include "components/policy/core/common/cloud/device_management_service.h"
21 #include "components/policy/core/common/configuration_policy_provider.h" 22 #include "components/policy/core/common/configuration_policy_provider.h"
22 #include "components/policy/core/common/policy_map.h" 23 #include "components/policy/core/common/policy_map.h"
23 #include "components/policy/core/common/policy_namespace.h" 24 #include "components/policy/core/common/policy_namespace.h"
24 #include "components/policy/core/common/policy_service.h" 25 #include "components/policy/core/common/policy_service.h"
25 #include "components/policy/core/common/policy_types.h" 26 #include "components/policy/core/common/policy_types.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } 116 }
116 #elif defined(OS_ANDROID) 117 #elif defined(OS_ANDROID)
117 return new policy::android::AndroidCombinedPolicyProvider( 118 return new policy::android::AndroidCombinedPolicyProvider(
118 GetSchemaRegistry()); 119 GetSchemaRegistry());
119 #else 120 #else
120 return NULL; 121 return NULL;
121 #endif 122 #endif
122 } 123 }
123 124
124 } // namespace policy 125 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/chrome_browser_policy_connector.h ('k') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698