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

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

Issue 7941008: Cosmetic cleanups in chrome/browser/policy/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload was broken? Created 9 years, 3 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/device_policy_cache.h" 5 #include "chrome/browser/policy/device_policy_cache.h"
6 6
7 #include <limits>
7 #include <string> 8 #include <string>
9 #include <vector>
8 10
9 #include "base/basictypes.h" 11 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
12 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
13 #include "base/values.h" 15 #include "base/values.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 16 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/cros/update_library.h" 17 #include "chrome/browser/chromeos/cros/update_library.h"
16 #include "chrome/browser/chromeos/cros_settings_names.h"
17 #include "chrome/browser/chromeos/login/ownership_service.h" 18 #include "chrome/browser/chromeos/login/ownership_service.h"
18 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 19 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
19 #include "chrome/browser/policy/cloud_policy_data_store.h" 20 #include "chrome/browser/policy/cloud_policy_data_store.h"
20 #include "chrome/browser/policy/enterprise_install_attributes.h" 21 #include "chrome/browser/policy/enterprise_install_attributes.h"
21 #include "chrome/browser/policy/enterprise_metrics.h" 22 #include "chrome/browser/policy/enterprise_metrics.h"
22 #include "chrome/browser/policy/policy_map.h" 23 #include "chrome/browser/policy/policy_map.h"
23 #include "chrome/browser/policy/proto/device_management_backend.pb.h" 24 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
24 #include "chrome/browser/policy/proto/device_management_constants.h" 25 #include "chrome/browser/policy/proto/device_management_constants.h"
25 #include "chrome/browser/policy/proto/device_management_local.pb.h" 26 #include "chrome/browser/policy/proto/device_management_local.pb.h"
26 #include "policy/configuration_policy_type.h" 27 #include "policy/configuration_policy_type.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 mandatory->Set( 346 mandatory->Set(
346 kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel)); 347 kPolicyChromeOsReleaseChannel, Value::CreateStringValue(channel));
347 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't 348 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
348 // have to pass the channel in here, only ping the update engine to tell 349 // have to pass the channel in here, only ping the update engine to tell
349 // it to fetch the channel from the policy. 350 // it to fetch the channel from the policy.
350 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel); 351 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
351 } 352 }
352 } 353 }
353 354
354 } // namespace policy 355 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_management_service.cc ('k') | chrome/browser/policy/device_policy_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698