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

Unified Diff: chrome/browser/chromeos/policy/device_local_account.cc

Issue 23460030: Clean up device policy definitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_local_account.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc
index 18ac3b403e294cfd82f50d035425f28252d604d3..2ad53ead08d131f0510cff9c9f137c649213851f 100644
--- a/chrome/browser/chromeos/policy/device_local_account.cc
+++ b/chrome/browser/chromeos/policy/device_local_account.cc
@@ -27,13 +27,11 @@ const char kDeviceLocalAccountDomainSuffix[] = ".device-local.localhost";
DeviceLocalAccount::DeviceLocalAccount(Type type,
const std::string& account_id,
- const std::string& kiosk_app_id,
- const std::string& kiosk_app_update_url)
+ const std::string& kiosk_app_id)
: type(type),
account_id(account_id),
user_id(GenerateDeviceLocalAccountUserId(account_id, type)),
- kiosk_app_id(kiosk_app_id),
- kiosk_app_update_url(kiosk_app_update_url) {
+ kiosk_app_id(kiosk_app_id) {
}
DeviceLocalAccount::~DeviceLocalAccount() {
@@ -87,11 +85,6 @@ void SetDeviceLocalAccounts(
entry->SetStringWithoutPathExpansion(
chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
it->kiosk_app_id);
- if (!it->kiosk_app_update_url.empty()) {
- entry->SetStringWithoutPathExpansion(
- chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
- it->kiosk_app_update_url);
- }
}
list.Append(entry.release());
}
@@ -136,7 +129,6 @@ std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
}
std::string kiosk_app_id;
- std::string kiosk_app_update_url;
if (type == DeviceLocalAccount::TYPE_KIOSK_APP) {
if (!entry->GetStringWithoutPathExpansion(
chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
@@ -145,9 +137,6 @@ std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
<< i << ".";
continue;
}
- entry->GetStringWithoutPathExpansion(
- chromeos::kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL,
- &kiosk_app_update_url);
}
if (!account_ids.insert(account_id).second) {
@@ -157,8 +146,7 @@ std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
}
accounts.push_back(DeviceLocalAccount(
- static_cast<DeviceLocalAccount::Type>(type),
- account_id, kiosk_app_id, kiosk_app_update_url));
+ static_cast<DeviceLocalAccount::Type>(type), account_id, kiosk_app_id));
}
return accounts;
}

Powered by Google App Engine
This is Rietveld 408576698