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

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

Issue 6272025: Part 2 of repairing regressions to my old clang check plugins so Nico can (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2011 Created 9 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/configuration_policy_provider_keeper.h" 5 #include "chrome/browser/policy/configuration_policy_provider_keeper.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "chrome/browser/policy/configuration_policy_pref_store.h" 8 #include "chrome/browser/policy/configuration_policy_pref_store.h"
9 #include "chrome/browser/policy/configuration_policy_provider.h" 9 #include "chrome/browser/policy/configuration_policy_provider.h"
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 16 matching lines...) Expand all
27 27
28 ConfigurationPolicyProviderKeeper::ConfigurationPolicyProviderKeeper( 28 ConfigurationPolicyProviderKeeper::ConfigurationPolicyProviderKeeper(
29 ConfigurationPolicyProvider* managed_platform_provider, 29 ConfigurationPolicyProvider* managed_platform_provider,
30 ConfigurationPolicyProvider* device_management_provider, 30 ConfigurationPolicyProvider* device_management_provider,
31 ConfigurationPolicyProvider* recommended_provider) 31 ConfigurationPolicyProvider* recommended_provider)
32 : managed_platform_provider_(managed_platform_provider), 32 : managed_platform_provider_(managed_platform_provider),
33 device_management_provider_(device_management_provider), 33 device_management_provider_(device_management_provider),
34 recommended_provider_(recommended_provider) { 34 recommended_provider_(recommended_provider) {
35 } 35 }
36 36
37 ConfigurationPolicyProviderKeeper::~ConfigurationPolicyProviderKeeper() {}
38
37 ConfigurationPolicyProvider* 39 ConfigurationPolicyProvider*
38 ConfigurationPolicyProviderKeeper::managed_platform_provider() const { 40 ConfigurationPolicyProviderKeeper::managed_platform_provider() const {
39 return managed_platform_provider_.get(); 41 return managed_platform_provider_.get();
40 } 42 }
41 43
42 ConfigurationPolicyProvider* 44 ConfigurationPolicyProvider*
43 ConfigurationPolicyProviderKeeper::device_management_provider() const { 45 ConfigurationPolicyProviderKeeper::device_management_provider() const {
44 return device_management_provider_.get(); 46 return device_management_provider_.get();
45 } 47 }
46 48
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 91 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
90 } else { 92 } else {
91 return new DummyConfigurationPolicyProvider(policy_list); 93 return new DummyConfigurationPolicyProvider(policy_list);
92 } 94 }
93 #else 95 #else
94 return new DummyConfigurationPolicyProvider(policy_list); 96 return new DummyConfigurationPolicyProvider(policy_list);
95 #endif 97 #endif
96 } 98 }
97 99
98 } // namespace 100 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_provider_keeper.h ('k') | chrome/browser/remoting/setup_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698