mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 94.0.4584.0 (main) (#30030)

Browse source 
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2021-07-26 09:02:16 -07:00 • committed by GitHub
parent a6ab702ae4
commit 64ba8feb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 531 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/extensions/api/tabs/tabs_api.cc
View file

@ -64,17 +64,27 @@ ExecuteCodeFunction::InitResult ExecuteCodeInTabFunction::Init() {
if (init_result_)
return init_result_.value();
// |tab_id| is optional so it's ok if it's not there.
int tab_id = -1;
if (args_->GetInteger(0, &tab_id) && tab_id < 0)
const auto& list = args_->GetList();
if (list.size() < 2)
return set_init_result(VALIDATION_FAILURE);
const auto& tab_id_value = list[0];
// |tab_id| is optional so it's ok if it's not there.
int tab_id = -1;
if (tab_id_value.is_int()) {
// But if it is present, it needs to be non-negative.
tab_id = tab_id_value.GetInt();
if (tab_id < 0) {
return set_init_result(VALIDATION_FAILURE);
}
}
// |details| are not optional.
base::DictionaryValue* details_value = NULL;
if (!args_->GetDictionary(1, &details_value))
const base::Value& details_value = list[1];
if (!details_value.is_dict())
return set_init_result(VALIDATION_FAILURE);
auto details = std::make_unique<InjectDetails>();
if (!InjectDetails::Populate(*details_value, details.get()))
std::unique_ptr<InjectDetails> details(new InjectDetails());
if (!InjectDetails::Populate(details_value, details.get()))
return set_init_result(VALIDATION_FAILURE);
if (tab_id == -1) {