| Index: chrome/browser/policy/configuration_policy_provider_mac.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_provider_mac.cc b/chrome/browser/policy/configuration_policy_provider_mac.cc
|
| index d732ff76255dd4146dcaf46ea5dc0cb8874fd364..b7e12aa9cb1423d1d4731b6f3a7ef980bcbbb39b 100644
|
| --- a/chrome/browser/policy/configuration_policy_provider_mac.cc
|
| +++ b/chrome/browser/policy/configuration_policy_provider_mac.cc
|
| @@ -1,19 +1,23 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #include "chrome/browser/policy/configuration_policy_provider_mac.h"
|
|
|
| +#include "base/file_path.h"
|
| #include "base/file_util.h"
|
| -#include "base/logging.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/path_service.h"
|
| +#include "base/platform_file.h"
|
| #include "base/sys_string_conversions.h"
|
| +#include "chrome/browser/preferences_mac.h"
|
| #include "chrome/common/chrome_paths.h"
|
|
|
| namespace policy {
|
|
|
| -static FilePath GetManagedPolicyPath() {
|
| +namespace {
|
| +
|
| +FilePath GetManagedPolicyPath() {
|
| // This constructs the path to the plist file in which Mac OS X stores the
|
| // managed preference for the application. This is undocumented and therefore
|
| // fragile, but if it doesn't work out, FileBasedPolicyLoader has a task that
|
| @@ -34,6 +38,8 @@ static FilePath GetManagedPolicyPath() {
|
| return path.Append(base::SysCFStringRefToUTF8(bundle_id) + ".plist");
|
| }
|
|
|
| +} // namespace
|
| +
|
| MacPreferencesPolicyProviderDelegate::MacPreferencesPolicyProviderDelegate(
|
| MacPreferences* preferences,
|
| const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list)
|
|
|