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

Side by Side Diff: chrome/browser/chromeos/device_settings_provider.cc

Issue 9691046: Updated the chrome_device_policy.proto, and AppPack decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/policy/app_pack_updater.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/device_settings_provider.h" 5 #include "chrome/browser/chromeos/device_settings_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 const proto_type& app_pack = policy.app_pack().app_pack(); 421 const proto_type& app_pack = policy.app_pack().app_pack();
422 for (proto_type::const_iterator it = app_pack.begin(); 422 for (proto_type::const_iterator it = app_pack.begin();
423 it != app_pack.end(); ++it) { 423 it != app_pack.end(); ++it) {
424 base::DictionaryValue* entry = new base::DictionaryValue; 424 base::DictionaryValue* entry = new base::DictionaryValue;
425 if (it->has_extension_id()) { 425 if (it->has_extension_id()) {
426 entry->SetString(policy::AppPackUpdater::kExtensionId, 426 entry->SetString(policy::AppPackUpdater::kExtensionId,
427 it->extension_id()); 427 it->extension_id());
428 } 428 }
429 if (it->has_update_url()) 429 if (it->has_update_url())
430 entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url()); 430 entry->SetString(policy::AppPackUpdater::kUpdateUrl, it->update_url());
431 if (it->has_key_checksum()) { 431 if (it->has_online_only()) {
432 entry->SetString(policy::AppPackUpdater::kKeyChecksum, 432 entry->SetBoolean(policy::AppPackUpdater::kOnlineOnly,
433 it->key_checksum()); 433 it->online_only());
434 } 434 }
435 list->Append(entry); 435 list->Append(entry);
436 } 436 }
437 new_values_cache->SetValue(kAppPack, list); 437 new_values_cache->SetValue(kAppPack, list);
438 } 438 }
439 } 439 }
440 440
441 void DeviceSettingsProvider::DecodeNetworkPolicies( 441 void DeviceSettingsProvider::DecodeNetworkPolicies(
442 const em::ChromeDeviceSettingsProto& policy, 442 const em::ChromeDeviceSettingsProto& policy,
443 PrefValueMap* new_values_cache) const { 443 PrefValueMap* new_values_cache) const {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 Reload(); 714 Reload();
715 return; 715 return;
716 } 716 }
717 LOG(ERROR) << "No retries left"; 717 LOG(ERROR) << "No retries left";
718 break; 718 break;
719 } 719 }
720 } 720 }
721 } 721 }
722 722
723 } // namespace chromeos 723 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/app_pack_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698