| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/supervised_user/legacy/permission_request_creator_sync.
h" | 5 #include "chrome/browser/supervised_user/legacy/permission_request_creator_sync.
h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "base/version.h" |
| 9 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 10 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| 10 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" | 11 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" |
| 11 #include "chrome/browser/sync/profile_sync_service.h" | 12 #include "chrome/browser/sync/profile_sync_service.h" |
| 12 #include "google_apis/gaia/google_service_auth_error.h" | 13 #include "google_apis/gaia/google_service_auth_error.h" |
| 13 #include "net/base/escape.h" | 14 #include "net/base/escape.h" |
| 14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 15 | 16 |
| 16 const char kSupervisedUserAccessRequestKeyPrefix[] = | 17 const char kSupervisedUserAccessRequestKeyPrefix[] = |
| 17 "X-ManagedUser-AccessRequests"; | 18 "X-ManagedUser-AccessRequests"; |
| 18 const char kSupervisedUserUpdateRequestKeyPrefix[] = | 19 const char kSupervisedUserUpdateRequestKeyPrefix[] = |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 void PermissionRequestCreatorSync::CreateURLAccessRequest( | 52 void PermissionRequestCreatorSync::CreateURLAccessRequest( |
| 52 const GURL& url_requested, | 53 const GURL& url_requested, |
| 53 const SuccessCallback& callback) { | 54 const SuccessCallback& callback) { |
| 54 CreateRequest(kSupervisedUserAccessRequestKeyPrefix, | 55 CreateRequest(kSupervisedUserAccessRequestKeyPrefix, |
| 55 url_requested.spec(), | 56 url_requested.spec(), |
| 56 callback); | 57 callback); |
| 57 } | 58 } |
| 58 | 59 |
| 59 void PermissionRequestCreatorSync::CreateExtensionUpdateRequest( | 60 void PermissionRequestCreatorSync::CreateExtensionUpdateRequest( |
| 60 const std::string& extension_id, | 61 const std::string& extension_id, |
| 62 const base::Version& version, |
| 61 const SuccessCallback& callback) { | 63 const SuccessCallback& callback) { |
| 62 CreateRequest(kSupervisedUserUpdateRequestKeyPrefix, extension_id, callback); | 64 std::string data = extension_id + ":" + version.GetString(); |
| 65 CreateRequest(kSupervisedUserUpdateRequestKeyPrefix, data, callback); |
| 63 } | 66 } |
| 64 | 67 |
| 65 void PermissionRequestCreatorSync::CreateRequest( | 68 void PermissionRequestCreatorSync::CreateRequest( |
| 66 const std::string& prefix, | 69 const std::string& prefix, |
| 67 const std::string& data, | 70 const std::string& data, |
| 68 const SuccessCallback& callback) { | 71 const SuccessCallback& callback) { |
| 69 // Escape the data string and add the prefix. | 72 // Escape the data string and add the prefix. |
| 70 std::string key = SupervisedUserSettingsService::MakeSplitSettingKey( | 73 std::string key = SupervisedUserSettingsService::MakeSplitSettingKey( |
| 71 prefix, | 74 prefix, |
| 72 net::EscapeQueryParamValue(data, true)); | 75 net::EscapeQueryParamValue(data, true)); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 84 if (value) { | 87 if (value) { |
| 85 bool success = value->GetAsBoolean(¬ifications_enabled); | 88 bool success = value->GetAsBoolean(¬ifications_enabled); |
| 86 DCHECK(success); | 89 DCHECK(success); |
| 87 } | 90 } |
| 88 dict->SetBoolean(kNotificationSetting, notifications_enabled); | 91 dict->SetBoolean(kNotificationSetting, notifications_enabled); |
| 89 | 92 |
| 90 settings_service_->UploadItem(key, dict.Pass()); | 93 settings_service_->UploadItem(key, dict.Pass()); |
| 91 | 94 |
| 92 callback.Run(true); | 95 callback.Run(true); |
| 93 } | 96 } |
| OLD | NEW |