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

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 676913002: kiosk: Support update url for enterprise. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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
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/policy/device_policy_decoder_chromeos.h" 5 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 chromeos::kAccountsPrefDeviceLocalAccountsKeyId, 191 chromeos::kAccountsPrefDeviceLocalAccountsKeyId,
192 entry->account_id()); 192 entry->account_id());
193 } 193 }
194 entry_dict->SetIntegerWithoutPathExpansion( 194 entry_dict->SetIntegerWithoutPathExpansion(
195 chromeos::kAccountsPrefDeviceLocalAccountsKeyType, entry->type()); 195 chromeos::kAccountsPrefDeviceLocalAccountsKeyType, entry->type());
196 if (entry->kiosk_app().has_app_id()) { 196 if (entry->kiosk_app().has_app_id()) {
197 entry_dict->SetStringWithoutPathExpansion( 197 entry_dict->SetStringWithoutPathExpansion(
198 chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId, 198 chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
199 entry->kiosk_app().app_id()); 199 entry->kiosk_app().app_id());
200 } 200 }
201 if (entry->kiosk_app().has_update_url()) {
202 entry_dict->SetStringWithoutPathExpansion(
203 chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
204 entry->kiosk_app().update_url());
205 }
201 } else if (entry->has_deprecated_public_session_id()) { 206 } else if (entry->has_deprecated_public_session_id()) {
202 // Deprecated public session specification. 207 // Deprecated public session specification.
203 entry_dict->SetStringWithoutPathExpansion( 208 entry_dict->SetStringWithoutPathExpansion(
204 chromeos::kAccountsPrefDeviceLocalAccountsKeyId, 209 chromeos::kAccountsPrefDeviceLocalAccountsKeyId,
205 entry->deprecated_public_session_id()); 210 entry->deprecated_public_session_id());
206 entry_dict->SetIntegerWithoutPathExpansion( 211 entry_dict->SetIntegerWithoutPathExpansion(
207 chromeos::kAccountsPrefDeviceLocalAccountsKeyType, 212 chromeos::kAccountsPrefDeviceLocalAccountsKeyType,
208 DeviceLocalAccount::TYPE_PUBLIC_SESSION); 213 DeviceLocalAccount::TYPE_PUBLIC_SESSION);
209 } 214 }
210 account_list->Append(entry_dict.release()); 215 account_list->Append(entry_dict.release());
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 DecodeLoginPolicies(policy, policies); 812 DecodeLoginPolicies(policy, policies);
808 DecodeKioskPolicies(policy, policies, install_attributes); 813 DecodeKioskPolicies(policy, policies, install_attributes);
809 DecodeNetworkPolicies(policy, policies, install_attributes); 814 DecodeNetworkPolicies(policy, policies, install_attributes);
810 DecodeReportingPolicies(policy, policies); 815 DecodeReportingPolicies(policy, policies);
811 DecodeAutoUpdatePolicies(policy, policies); 816 DecodeAutoUpdatePolicies(policy, policies);
812 DecodeAccessibilityPolicies(policy, policies); 817 DecodeAccessibilityPolicies(policy, policies);
813 DecodeGenericPolicies(policy, policies); 818 DecodeGenericPolicies(policy, policies);
814 } 819 }
815 820
816 } // namespace policy 821 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698