Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "chrome/browser/chromeos/extensions/public_session_permission_helper_im pl.h" | |
| 6 | |
| 7 #include <utility> | |
| 8 | |
| 9 #include "base/bind.h" | |
| 10 #include "base/bind_helpers.h" | |
| 11 #include "base/memory/ptr_util.h" | |
| 12 #include "content/public/browser/web_contents.h" | |
| 13 #include "extensions/common/permissions/api_permission_set.h" | |
| 14 #include "extensions/common/permissions/manifest_permission_set.h" | |
| 15 #include "extensions/common/permissions/permission_set.h" | |
| 16 #include "extensions/common/url_pattern_set.h" | |
| 17 | |
| 18 namespace extensions { | |
| 19 namespace permission_helper { | |
| 20 | |
| 21 RequestCallback::RequestCallback( | |
| 22 const base::Closure& success_callback, | |
| 23 const base::Closure& failure_callback, | |
| 24 const PermissionHelperSet& permission_list) | |
| 25 : success_callback(success_callback), | |
| 26 failure_callback(failure_callback), | |
| 27 permission_list(permission_list) {} | |
| 28 | |
| 29 RequestCallback::RequestCallback( | |
| 30 const RequestCallback& other) | |
| 31 : success_callback(other.success_callback), | |
| 32 failure_callback(other.failure_callback), | |
| 33 permission_list(other.permission_list) {} | |
| 34 | |
| 35 RequestCallback::~RequestCallback() {} | |
| 36 | |
| 37 PublicSessionPermissionHelperImpl::PublicSessionPermissionHelperImpl() {} | |
| 38 | |
| 39 PublicSessionPermissionHelperImpl::PublicSessionPermissionHelperImpl( | |
| 40 PublicSessionPermissionHelperImpl&& other) = default; | |
| 41 | |
| 42 PublicSessionPermissionHelperImpl::~PublicSessionPermissionHelperImpl() {} | |
| 43 | |
| 44 void PublicSessionPermissionHelperImpl::HandlePermissionRequest( | |
| 45 const Extension* extension, | |
| 46 PermissionHelperSet requested_permissions, | |
| 47 content::WebContents* web_contents, | |
| 48 const base::Closure& success_callback, | |
| 49 const base::Closure& failure_callback) { | |
| 50 CHECK(web_contents); | |
| 51 | |
| 52 PermissionIDSet requested_permission_set; | |
| 53 for (auto permission : requested_permissions) { | |
| 54 requested_permission_set.insert(permission); | |
| 55 } | |
| 56 | |
| 57 PermissionIDSet unresolved_permissions = PermissionIDSet::Difference( | |
| 58 requested_permission_set, allowed_permission_set_); | |
| 59 if (unresolved_permissions.empty()) { | |
| 60 success_callback.Run(); | |
| 61 return; | |
| 62 } | |
| 63 unresolved_permissions = PermissionIDSet::Difference( | |
| 64 unresolved_permissions, denied_permission_set_); | |
| 65 if (unresolved_permissions.empty()) { | |
| 66 failure_callback.Run(); | |
|
Devlin
2017/01/23 22:59:48
It's a little weird that a request can request mul
Ivan Šandrk
2017/01/24 19:57:22
PublicSessionMediaAccessHandler may ask up to two
| |
| 67 return; | |
| 68 } | |
| 69 | |
| 70 // Since not all permissions are resolved yet, queue the callback to be called | |
| 71 // when all of them are resolved. | |
| 72 callbacks_.push_back(RequestCallback( | |
| 73 success_callback, failure_callback, requested_permissions)); | |
| 74 | |
| 75 PermissionIDSet unprompted_permissions = PermissionIDSet::Difference( | |
| 76 unresolved_permissions, prompted_permission_set_); | |
| 77 if (unprompted_permissions.empty()) return; | |
|
Devlin
2017/01/25 16:00:31
return; should be on a new line
Ivan Šandrk
2017/01/26 18:53:21
Style guide allows this https://google.github.io/s
Devlin
2017/01/30 17:04:16
In this case, I'm just going to lean on the fact t
Ivan Šandrk
2017/01/30 18:14:20
Done.
| |
| 78 | |
| 79 APIPermission::ID first_unprompted_permission = | |
| 80 unprompted_permissions.begin()->id(); | |
| 81 APIPermissionSet new_apis; | |
| 82 for (const auto& permission : unprompted_permissions) { | |
| 83 prompted_permission_set_.insert(permission.id()); | |
| 84 new_apis.insert(permission.id()); | |
| 85 } | |
| 86 auto permission_set = base::MakeUnique<PermissionSet>( | |
| 87 new_apis, ManifestPermissionSet(), URLPatternSet(), URLPatternSet()); | |
| 88 auto prompt = base::MakeUnique<ExtensionInstallPrompt>(web_contents); | |
| 89 prompt->ShowDialog( | |
|
Devlin
2017/01/23 22:59:48
Here, it looks like we're anticipating showing mul
Ivan Šandrk
2017/01/24 19:57:22
Yes, spam-open.
| |
| 90 base::Bind(&PublicSessionPermissionHelperImpl::ResolvePermissionPrompt, | |
| 91 base::Unretained(this), extension, | |
| 92 std::move(unprompted_permissions)), | |
| 93 extension, | |
| 94 nullptr, // Use the extension icon. | |
| 95 base::MakeUnique<ExtensionInstallPrompt::Prompt>( | |
| 96 ExtensionInstallPrompt::PERMISSIONS_PROMPT), | |
| 97 std::move(permission_set), | |
| 98 ExtensionInstallPrompt::GetDefaultShowDialogCallback()); | |
| 99 prompt_map_[first_unprompted_permission] = std::move(prompt); | |
| 100 } | |
| 101 | |
| 102 PermissionState PublicSessionPermissionHelperImpl::GetUserChoice( | |
| 103 APIPermission::ID permission_id) { | |
| 104 if (allowed_permission_set_.ContainsID(permission_id)) | |
| 105 return PermissionState::ALLOWED; | |
| 106 if (denied_permission_set_.ContainsID(permission_id)) | |
| 107 return PermissionState::DENIED; | |
| 108 if (prompted_permission_set_.ContainsID(permission_id)) | |
| 109 return PermissionState::SHOWN_PROMPT; | |
| 110 return PermissionState::NOT_PROMPTED; | |
| 111 } | |
| 112 | |
| 113 void PublicSessionPermissionHelperImpl::ResolvePermissionPrompt( | |
| 114 const Extension* extension, | |
| 115 PermissionIDSet unprompted_permissions, | |
| 116 ExtensionInstallPrompt::Result prompt_result) { | |
| 117 // Dispose of the prompt as it's not needed anymore. | |
| 118 prompt_map_.erase(unprompted_permissions.begin()->id()); | |
| 119 | |
| 120 bool allowed = prompt_result == ExtensionInstallPrompt::Result::ACCEPTED; | |
| 121 for (const auto& permission : unprompted_permissions) { | |
| 122 prompted_permission_set_.erase(permission.id()); | |
| 123 if (allowed) | |
| 124 allowed_permission_set_.insert(permission.id()); | |
| 125 else | |
| 126 denied_permission_set_.insert(permission.id()); | |
| 127 } | |
| 128 | |
| 129 for (auto callback = callbacks_.begin(); | |
| 130 callback != callbacks_.end(); ) { | |
|
Devlin
2017/01/25 16:00:31
nit: no space after ;
Ivan Šandrk
2017/01/26 18:53:22
https://google.github.io/styleguide/cppguide.html#
| |
| 131 if (prompted_permission_set_.ContainsAnyID(callback->permission_list)) { | |
| 132 callback++; | |
| 133 continue; | |
| 134 } | |
| 135 if (denied_permission_set_.ContainsAnyID(callback->permission_list)) | |
| 136 callback->failure_callback.Run(); | |
| 137 else | |
| 138 callback->success_callback.Run(); | |
| 139 callbacks_.erase(callback); | |
| 140 } | |
| 141 } | |
| 142 | |
| 143 } // namespace permission_helper | |
| 144 } // namespace extensions | |
| OLD | NEW |