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

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

Issue 8382005: Rename network configuration policy as per Zhanyong's proposal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test. Created 9 years, 2 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 <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 policy.release_channel().has_release_channel()) { 346 policy.release_channel().has_release_channel()) {
347 std::string channel(policy.release_channel().release_channel()); 347 std::string channel(policy.release_channel().release_channel());
348 mandatory->Set(kPolicyChromeOsReleaseChannel, 348 mandatory->Set(kPolicyChromeOsReleaseChannel,
349 Value::CreateStringValue(channel)); 349 Value::CreateStringValue(channel));
350 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't 350 // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
351 // have to pass the channel in here, only ping the update engine to tell 351 // have to pass the channel in here, only ping the update engine to tell
352 // it to fetch the channel from the policy. 352 // it to fetch the channel from the policy.
353 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel); 353 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
354 } 354 }
355 355
356 if (policy.has_network_configuration() && 356 if (policy.has_open_network_configuration() &&
357 policy.network_configuration().has_network_configuration()) { 357 policy.open_network_configuration().has_open_network_configuration()) {
358 std::string config(policy.network_configuration().network_configuration()); 358 std::string config(
359 mandatory->Set(kPolicyDeviceNetworkConfiguration, 359 policy.open_network_configuration().open_network_configuration());
360 mandatory->Set(kPolicyDeviceOpenNetworkConfiguration,
360 Value::CreateStringValue(config)); 361 Value::CreateStringValue(config));
361 } 362 }
362 } 363 }
363 364
364 } // namespace policy 365 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/policy/device_policy_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698