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

Side by Side Diff: chrome/browser/pepper_flash_settings_manager.cc

Issue 2828663002: Rewrite base::Bind to base::BindOnce with base_bind_rewriters in //chrome/browser/{i,l,m,n,p,r}* (Closed)
Patch Set: Created 3 years, 8 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
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/pepper_flash_settings_manager.h" 5 #include "chrome/browser/pepper_flash_settings_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 DCHECK_CURRENTLY_ON(BrowserThread::UI); 220 DCHECK_CURRENTLY_ON(BrowserThread::UI);
221 } 221 }
222 222
223 PepperFlashSettingsManager::Core::~Core() { 223 PepperFlashSettingsManager::Core::~Core() {
224 DCHECK_CURRENTLY_ON(BrowserThread::IO); 224 DCHECK_CURRENTLY_ON(BrowserThread::IO);
225 } 225 }
226 226
227 void PepperFlashSettingsManager::Core::Initialize() { 227 void PepperFlashSettingsManager::Core::Initialize() {
228 DCHECK_CURRENTLY_ON(BrowserThread::UI); 228 DCHECK_CURRENTLY_ON(BrowserThread::UI);
229 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 229 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
230 base::Bind(&Core::InitializeOnIOThread, this)); 230 base::BindOnce(&Core::InitializeOnIOThread, this));
231 } 231 }
232 232
233 void PepperFlashSettingsManager::Core::Detach() { 233 void PepperFlashSettingsManager::Core::Detach() {
234 DCHECK_CURRENTLY_ON(BrowserThread::UI); 234 DCHECK_CURRENTLY_ON(BrowserThread::UI);
235 235
236 // This call guarantees that one ref is retained until we get to the DETACHED 236 // This call guarantees that one ref is retained until we get to the DETACHED
237 // state. This is important. Otherwise, if the ref count drops to zero on the 237 // state. This is important. Otherwise, if the ref count drops to zero on the
238 // UI thread (which posts a task to delete this object on the I/O thread) 238 // UI thread (which posts a task to delete this object on the I/O thread)
239 // while the I/O thread doesn't know about it, methods on the I/O thread might 239 // while the I/O thread doesn't know about it, methods on the I/O thread might
240 // increase the ref count again and cause double deletion. 240 // increase the ref count again and cause double deletion.
241 BrowserThread::PostTask( 241 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
242 BrowserThread::IO, FROM_HERE, base::Bind(&Core::DetachOnIOThread, this)); 242 base::BindOnce(&Core::DetachOnIOThread, this));
243 } 243 }
244 244
245 void PepperFlashSettingsManager::Core::DeauthorizeContentLicenses( 245 void PepperFlashSettingsManager::Core::DeauthorizeContentLicenses(
246 uint32_t request_id) { 246 uint32_t request_id) {
247 DCHECK_CURRENTLY_ON(BrowserThread::UI); 247 DCHECK_CURRENTLY_ON(BrowserThread::UI);
248 248
249 BrowserThread::PostTask( 249 BrowserThread::PostTask(
250 BrowserThread::IO, FROM_HERE, 250 BrowserThread::IO, FROM_HERE,
251 base::Bind(&Core::DeauthorizeContentLicensesOnIOThread, this, 251 base::BindOnce(&Core::DeauthorizeContentLicensesOnIOThread, this,
252 request_id)); 252 request_id));
253 } 253 }
254 254
255 void PepperFlashSettingsManager::Core::GetPermissionSettings( 255 void PepperFlashSettingsManager::Core::GetPermissionSettings(
256 uint32_t request_id, 256 uint32_t request_id,
257 PP_Flash_BrowserOperations_SettingType setting_type) { 257 PP_Flash_BrowserOperations_SettingType setting_type) {
258 DCHECK_CURRENTLY_ON(BrowserThread::UI); 258 DCHECK_CURRENTLY_ON(BrowserThread::UI);
259 259
260 BrowserThread::PostTask( 260 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
261 BrowserThread::IO, FROM_HERE, 261 base::BindOnce(&Core::GetPermissionSettingsOnIOThread,
262 base::Bind(&Core::GetPermissionSettingsOnIOThread, this, request_id, 262 this, request_id, setting_type));
263 setting_type));
264 } 263 }
265 264
266 void PepperFlashSettingsManager::Core::SetDefaultPermission( 265 void PepperFlashSettingsManager::Core::SetDefaultPermission(
267 uint32_t request_id, 266 uint32_t request_id,
268 PP_Flash_BrowserOperations_SettingType setting_type, 267 PP_Flash_BrowserOperations_SettingType setting_type,
269 PP_Flash_BrowserOperations_Permission permission, 268 PP_Flash_BrowserOperations_Permission permission,
270 bool clear_site_specific) { 269 bool clear_site_specific) {
271 DCHECK_CURRENTLY_ON(BrowserThread::UI); 270 DCHECK_CURRENTLY_ON(BrowserThread::UI);
272 271
273 BrowserThread::PostTask( 272 BrowserThread::PostTask(
274 BrowserThread::IO, FROM_HERE, 273 BrowserThread::IO, FROM_HERE,
275 base::Bind(&Core::SetDefaultPermissionOnIOThread, this, request_id, 274 base::BindOnce(&Core::SetDefaultPermissionOnIOThread, this, request_id,
276 setting_type, permission, clear_site_specific)); 275 setting_type, permission, clear_site_specific));
277 } 276 }
278 277
279 void PepperFlashSettingsManager::Core::SetSitePermission( 278 void PepperFlashSettingsManager::Core::SetSitePermission(
280 uint32_t request_id, 279 uint32_t request_id,
281 PP_Flash_BrowserOperations_SettingType setting_type, 280 PP_Flash_BrowserOperations_SettingType setting_type,
282 const ppapi::FlashSiteSettings& sites) { 281 const ppapi::FlashSiteSettings& sites) {
283 DCHECK_CURRENTLY_ON(BrowserThread::UI); 282 DCHECK_CURRENTLY_ON(BrowserThread::UI);
284 283
285 BrowserThread::PostTask( 284 BrowserThread::PostTask(
286 BrowserThread::IO, FROM_HERE, 285 BrowserThread::IO, FROM_HERE,
287 base::Bind(&Core::SetSitePermissionOnIOThread, this, request_id, 286 base::BindOnce(&Core::SetSitePermissionOnIOThread, this, request_id,
288 setting_type, sites)); 287 setting_type, sites));
289 } 288 }
290 289
291 void PepperFlashSettingsManager::Core::GetSitesWithData(uint32_t request_id) { 290 void PepperFlashSettingsManager::Core::GetSitesWithData(uint32_t request_id) {
292 DCHECK_CURRENTLY_ON(BrowserThread::UI); 291 DCHECK_CURRENTLY_ON(BrowserThread::UI);
293 292
294 BrowserThread::PostTask( 293 BrowserThread::PostTask(
295 BrowserThread::IO, FROM_HERE, 294 BrowserThread::IO, FROM_HERE,
296 base::Bind(&Core::GetSitesWithDataOnIOThread, this, request_id)); 295 base::BindOnce(&Core::GetSitesWithDataOnIOThread, this, request_id));
297 } 296 }
298 297
299 void PepperFlashSettingsManager::Core::ClearSiteData(uint32_t request_id, 298 void PepperFlashSettingsManager::Core::ClearSiteData(uint32_t request_id,
300 const std::string& site, 299 const std::string& site,
301 uint64_t flags, 300 uint64_t flags,
302 uint64_t max_age) { 301 uint64_t max_age) {
303 DCHECK_CURRENTLY_ON(BrowserThread::UI); 302 DCHECK_CURRENTLY_ON(BrowserThread::UI);
304 303
305 BrowserThread::PostTask( 304 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
306 BrowserThread::IO, FROM_HERE, 305 base::BindOnce(&Core::ClearSiteDataOnIOThread, this,
307 base::Bind(&Core::ClearSiteDataOnIOThread, this, request_id, 306 request_id, site, flags, max_age));
308 site, flags, max_age));
309 } 307 }
310 308
311 bool PepperFlashSettingsManager::Core::OnMessageReceived( 309 bool PepperFlashSettingsManager::Core::OnMessageReceived(
312 const IPC::Message& message) { 310 const IPC::Message& message) {
313 IPC_BEGIN_MESSAGE_MAP(Core, message) 311 IPC_BEGIN_MESSAGE_MAP(Core, message)
314 IPC_MESSAGE_HANDLER(PpapiHostMsg_DeauthorizeContentLicensesResult, 312 IPC_MESSAGE_HANDLER(PpapiHostMsg_DeauthorizeContentLicensesResult,
315 OnDeauthorizeContentLicensesResult) 313 OnDeauthorizeContentLicensesResult)
316 IPC_MESSAGE_HANDLER(PpapiHostMsg_GetPermissionSettingsResult, 314 IPC_MESSAGE_HANDLER(PpapiHostMsg_GetPermissionSettingsResult,
317 OnGetPermissionSettingsResult) 315 OnGetPermissionSettingsResult)
318 IPC_MESSAGE_HANDLER(PpapiHostMsg_SetDefaultPermissionResult, 316 IPC_MESSAGE_HANDLER(PpapiHostMsg_SetDefaultPermissionResult,
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 uint32_t request_id, 457 uint32_t request_id,
460 const base::FilePath& profile_path) { 458 const base::FilePath& profile_path) {
461 // ChromeOS used to store the device ID in a file but this is no longer used. 459 // ChromeOS used to store the device ID in a file but this is no longer used.
462 // Wipe that file. 460 // Wipe that file.
463 const base::FilePath& device_id_path = 461 const base::FilePath& device_id_path =
464 chrome::DeviceIDFetcher::GetLegacyDeviceIDPath(profile_path); 462 chrome::DeviceIDFetcher::GetLegacyDeviceIDPath(profile_path);
465 bool success = base::DeleteFile(device_id_path, false); 463 bool success = base::DeleteFile(device_id_path, false);
466 464
467 BrowserThread::PostTask( 465 BrowserThread::PostTask(
468 BrowserThread::IO, FROM_HERE, 466 BrowserThread::IO, FROM_HERE,
469 base::Bind(&Core::DeauthorizeContentLicensesInPlugin, this, request_id, 467 base::BindOnce(&Core::DeauthorizeContentLicensesInPlugin, this,
470 success)); 468 request_id, success));
471 } 469 }
472 470
473 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin( 471 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin(
474 uint32_t request_id, 472 uint32_t request_id,
475 bool success) { 473 bool success) {
476 DCHECK_CURRENTLY_ON(BrowserThread::IO); 474 DCHECK_CURRENTLY_ON(BrowserThread::IO);
477 if (!success) { 475 if (!success) {
478 NotifyErrorFromIOThread(); 476 NotifyErrorFromIOThread();
479 return; 477 return;
480 } 478 }
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 iter != pending_requests_.end(); ++iter) { 666 iter != pending_requests_.end(); ++iter) {
669 notifications.push_back(std::make_pair(iter->id, iter->type)); 667 notifications.push_back(std::make_pair(iter->id, iter->type));
670 } 668 }
671 pending_requests_.clear(); 669 pending_requests_.clear();
672 notifications.insert(notifications.end(), pending_responses_.begin(), 670 notifications.insert(notifications.end(), pending_responses_.begin(),
673 pending_responses_.end()); 671 pending_responses_.end());
674 pending_responses_.clear(); 672 pending_responses_.clear();
675 673
676 BrowserThread::PostTask( 674 BrowserThread::PostTask(
677 BrowserThread::UI, FROM_HERE, 675 BrowserThread::UI, FROM_HERE,
678 base::Bind(&Core::NotifyError, this, notifications)); 676 base::BindOnce(&Core::NotifyError, this, notifications));
679 } 677 }
680 678
681 void PepperFlashSettingsManager::Core:: 679 void PepperFlashSettingsManager::Core::
682 NotifyDeauthorizeContentLicensesCompleted(uint32_t request_id, 680 NotifyDeauthorizeContentLicensesCompleted(uint32_t request_id,
683 bool success) { 681 bool success) {
684 DCHECK_CURRENTLY_ON(BrowserThread::UI); 682 DCHECK_CURRENTLY_ON(BrowserThread::UI);
685 683
686 if (manager_.get()) { 684 if (manager_.get()) {
687 manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(request_id, 685 manager_->client_->OnDeauthorizeFlashContentLicensesCompleted(request_id,
688 success); 686 success);
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 std::map<uint32_t, RequestType>::iterator iter = 801 std::map<uint32_t, RequestType>::iterator iter =
804 pending_responses_.find(request_id); 802 pending_responses_.find(request_id);
805 if (iter == pending_responses_.end()) 803 if (iter == pending_responses_.end())
806 return; 804 return;
807 805
808 DCHECK_EQ(iter->second, DEAUTHORIZE_CONTENT_LICENSES); 806 DCHECK_EQ(iter->second, DEAUTHORIZE_CONTENT_LICENSES);
809 807
810 pending_responses_.erase(iter); 808 pending_responses_.erase(iter);
811 BrowserThread::PostTask( 809 BrowserThread::PostTask(
812 BrowserThread::UI, FROM_HERE, 810 BrowserThread::UI, FROM_HERE,
813 base::Bind(&Core::NotifyDeauthorizeContentLicensesCompleted, this, 811 base::BindOnce(&Core::NotifyDeauthorizeContentLicensesCompleted, this,
814 request_id, success)); 812 request_id, success));
815 } 813 }
816 814
817 void PepperFlashSettingsManager::Core::OnGetPermissionSettingsResult( 815 void PepperFlashSettingsManager::Core::OnGetPermissionSettingsResult(
818 uint32_t request_id, 816 uint32_t request_id,
819 bool success, 817 bool success,
820 PP_Flash_BrowserOperations_Permission default_permission, 818 PP_Flash_BrowserOperations_Permission default_permission,
821 const ppapi::FlashSiteSettings& sites) { 819 const ppapi::FlashSiteSettings& sites) {
822 DCHECK_CURRENTLY_ON(BrowserThread::IO); 820 DCHECK_CURRENTLY_ON(BrowserThread::IO);
823 if (state_ == STATE_DETACHED) 821 if (state_ == STATE_DETACHED)
824 return; 822 return;
825 823
826 DLOG_IF(ERROR, !success) << "GetPermissionSettings returned error"; 824 DLOG_IF(ERROR, !success) << "GetPermissionSettings returned error";
827 825
828 std::map<uint32_t, RequestType>::iterator iter = 826 std::map<uint32_t, RequestType>::iterator iter =
829 pending_responses_.find(request_id); 827 pending_responses_.find(request_id);
830 if (iter == pending_responses_.end()) 828 if (iter == pending_responses_.end())
831 return; 829 return;
832 830
833 DCHECK_EQ(iter->second, GET_PERMISSION_SETTINGS); 831 DCHECK_EQ(iter->second, GET_PERMISSION_SETTINGS);
834 832
835 pending_responses_.erase(iter); 833 pending_responses_.erase(iter);
836 BrowserThread::PostTask( 834 BrowserThread::PostTask(
837 BrowserThread::UI, FROM_HERE, 835 BrowserThread::UI, FROM_HERE,
838 base::Bind(&Core::NotifyGetPermissionSettingsCompleted, this, 836 base::BindOnce(&Core::NotifyGetPermissionSettingsCompleted, this,
839 request_id, success, default_permission, sites)); 837 request_id, success, default_permission, sites));
840 } 838 }
841 839
842 void PepperFlashSettingsManager::Core::OnSetDefaultPermissionResult( 840 void PepperFlashSettingsManager::Core::OnSetDefaultPermissionResult(
843 uint32_t request_id, 841 uint32_t request_id,
844 bool success) { 842 bool success) {
845 DCHECK_CURRENTLY_ON(BrowserThread::IO); 843 DCHECK_CURRENTLY_ON(BrowserThread::IO);
846 if (state_ == STATE_DETACHED) 844 if (state_ == STATE_DETACHED)
847 return; 845 return;
848 846
849 DLOG_IF(ERROR, !success) << "SetDefaultPermission returned error"; 847 DLOG_IF(ERROR, !success) << "SetDefaultPermission returned error";
850 848
851 std::map<uint32_t, RequestType>::iterator iter = 849 std::map<uint32_t, RequestType>::iterator iter =
852 pending_responses_.find(request_id); 850 pending_responses_.find(request_id);
853 if (iter == pending_responses_.end()) 851 if (iter == pending_responses_.end())
854 return; 852 return;
855 853
856 DCHECK_EQ(iter->second, SET_DEFAULT_PERMISSION); 854 DCHECK_EQ(iter->second, SET_DEFAULT_PERMISSION);
857 855
858 pending_responses_.erase(iter); 856 pending_responses_.erase(iter);
859 BrowserThread::PostTask( 857 BrowserThread::PostTask(
860 BrowserThread::UI, FROM_HERE, 858 BrowserThread::UI, FROM_HERE,
861 base::Bind(&Core::NotifySetDefaultPermissionCompleted, this, 859 base::BindOnce(&Core::NotifySetDefaultPermissionCompleted, this,
862 request_id, success)); 860 request_id, success));
863 } 861 }
864 862
865 void PepperFlashSettingsManager::Core::OnSetSitePermissionResult( 863 void PepperFlashSettingsManager::Core::OnSetSitePermissionResult(
866 uint32_t request_id, 864 uint32_t request_id,
867 bool success) { 865 bool success) {
868 DCHECK_CURRENTLY_ON(BrowserThread::IO); 866 DCHECK_CURRENTLY_ON(BrowserThread::IO);
869 if (state_ == STATE_DETACHED) 867 if (state_ == STATE_DETACHED)
870 return; 868 return;
871 869
872 DLOG_IF(ERROR, !success) << "SetSitePermission returned error"; 870 DLOG_IF(ERROR, !success) << "SetSitePermission returned error";
873 871
874 std::map<uint32_t, RequestType>::iterator iter = 872 std::map<uint32_t, RequestType>::iterator iter =
875 pending_responses_.find(request_id); 873 pending_responses_.find(request_id);
876 if (iter == pending_responses_.end()) 874 if (iter == pending_responses_.end())
877 return; 875 return;
878 876
879 DCHECK_EQ(iter->second, SET_SITE_PERMISSION); 877 DCHECK_EQ(iter->second, SET_SITE_PERMISSION);
880 878
881 pending_responses_.erase(iter); 879 pending_responses_.erase(iter);
882 BrowserThread::PostTask( 880 BrowserThread::PostTask(
883 BrowserThread::UI, FROM_HERE, 881 BrowserThread::UI, FROM_HERE,
884 base::Bind(&Core::NotifySetSitePermissionCompleted, this, request_id, 882 base::BindOnce(&Core::NotifySetSitePermissionCompleted, this, request_id,
885 success)); 883 success));
886 } 884 }
887 885
888 void PepperFlashSettingsManager::Core::OnGetSitesWithDataResult( 886 void PepperFlashSettingsManager::Core::OnGetSitesWithDataResult(
889 uint32_t request_id, 887 uint32_t request_id,
890 const std::vector<std::string>& sites) { 888 const std::vector<std::string>& sites) {
891 DCHECK_CURRENTLY_ON(BrowserThread::IO); 889 DCHECK_CURRENTLY_ON(BrowserThread::IO);
892 if (state_ == STATE_DETACHED) 890 if (state_ == STATE_DETACHED)
893 return; 891 return;
894 892
895 std::map<uint32_t, RequestType>::iterator iter = 893 std::map<uint32_t, RequestType>::iterator iter =
896 pending_responses_.find(request_id); 894 pending_responses_.find(request_id);
897 if (iter == pending_responses_.end()) 895 if (iter == pending_responses_.end())
898 return; 896 return;
899 897
900 DCHECK_EQ(iter->second, GET_SITES_WITH_DATA); 898 DCHECK_EQ(iter->second, GET_SITES_WITH_DATA);
901 899
902 pending_responses_.erase(iter); 900 pending_responses_.erase(iter);
903 BrowserThread::PostTask( 901 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
904 BrowserThread::UI, FROM_HERE, 902 base::BindOnce(&Core::NotifyGetSitesWithDataCompleted,
905 base::Bind(&Core::NotifyGetSitesWithDataCompleted, this, request_id, 903 this, request_id, sites));
906 sites));
907 } 904 }
908 905
909 void PepperFlashSettingsManager::Core::OnClearSiteDataResult( 906 void PepperFlashSettingsManager::Core::OnClearSiteDataResult(
910 uint32_t request_id, 907 uint32_t request_id,
911 bool success) { 908 bool success) {
912 DCHECK_CURRENTLY_ON(BrowserThread::IO); 909 DCHECK_CURRENTLY_ON(BrowserThread::IO);
913 if (state_ == STATE_DETACHED) 910 if (state_ == STATE_DETACHED)
914 return; 911 return;
915 912
916 DLOG_IF(ERROR, !success) << "ClearSiteData returned error"; 913 DLOG_IF(ERROR, !success) << "ClearSiteData returned error";
917 914
918 std::map<uint32_t, RequestType>::iterator iter = 915 std::map<uint32_t, RequestType>::iterator iter =
919 pending_responses_.find(request_id); 916 pending_responses_.find(request_id);
920 if (iter == pending_responses_.end()) 917 if (iter == pending_responses_.end())
921 return; 918 return;
922 919
923 DCHECK_EQ(iter->second, CLEAR_SITE_DATA); 920 DCHECK_EQ(iter->second, CLEAR_SITE_DATA);
924 921
925 pending_responses_.erase(iter); 922 pending_responses_.erase(iter);
926 BrowserThread::PostTask( 923 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
927 BrowserThread::UI, FROM_HERE, 924 base::BindOnce(&Core::NotifyClearSiteDataCompleted,
928 base::Bind(&Core::NotifyClearSiteDataCompleted, this, request_id, 925 this, request_id, success));
929 success));
930 } 926 }
931 927
932 PepperFlashSettingsManager::PepperFlashSettingsManager( 928 PepperFlashSettingsManager::PepperFlashSettingsManager(
933 Client* client, 929 Client* client,
934 content::BrowserContext* browser_context) 930 content::BrowserContext* browser_context)
935 : client_(client), 931 : client_(client),
936 browser_context_(browser_context), 932 browser_context_(browser_context),
937 next_request_id_(1), 933 next_request_id_(1),
938 weak_ptr_factory_(this) { 934 weak_ptr_factory_(this) {
939 DCHECK(client); 935 DCHECK(client);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 } 1052 }
1057 1053
1058 void PepperFlashSettingsManager::OnError(Core* core) { 1054 void PepperFlashSettingsManager::OnError(Core* core) {
1059 DCHECK(core); 1055 DCHECK(core);
1060 if (core != core_.get()) 1056 if (core != core_.get())
1061 return; 1057 return;
1062 1058
1063 core_->Detach(); 1059 core_->Detach();
1064 core_ = NULL; 1060 core_ = NULL;
1065 } 1061 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698