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

chore: bump chromium to 107.0.5286.0 (main) (#35590)

Browse source 
* chore: bump chromium in DEPS to 107.0.5286.0

* 3866335: media: Rename KeySystemProperties to KeySystemInfo - file renaming

3866335

* 3864686: [PA] Introduce *Scan buildflag

3864686

* chore: fixup patch indices

* 3849359: Remove unused PrefValueStore::Delegate

3849359

* 3873005: [CodeHealth] Modernising extensions Tab utils

3873005

* 3846595: Auto-select PipeWire target once selection is made

3846595

* 3826169: [json-schema-compiler] Support abs::optional<bool>

3826169

* fixup! Remove unused PrefValueStore::Delegate

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-09-08 16:23:08 -07:00 • committed by GitHub
parent a0dbae72c8
commit b0036ea43a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 164 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -221,8 +221,7 @@ ExtensionFunction::ResponseAction TabsGetFunction::Run() {
// TODO(nornagon): in Chrome, the tab URL is only available to extensions
// that have the "tabs" (or "activeTab") permission. We should do the same
// permission check here.
tab.url = std::make_unique<std::string>(
contents->web_contents()->GetLastCommittedURL().spec());
tab.url = contents->web_contents()->GetLastCommittedURL().spec();
tab.active = contents->IsFocused();
@ -438,7 +437,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
// Navigate the tab to a new location if the url is different.
std::string error;
if (params->update_properties.url.get()) {
if (params->update_properties.url) {
std::string updated_url = *params->update_properties.url;
if (!UpdateURL(updated_url, tab_id, &error))
return RespondNow(Error(std::move(error)));
@ -506,8 +505,7 @@ ExtensionFunction::ResponseValue TabsUpdateFunction::GetResult() {
// TODO(nornagon): in Chrome, the tab URL is only available to extensions
// that have the "tabs" (or "activeTab") permission. We should do the same
// permission check here.
tab.url = std::make_unique<std::string>(
web_contents_->GetLastCommittedURL().spec());
tab.url = web_contents_->GetLastCommittedURL().spec();
return ArgumentList(tabs::Get::Results::Create(std::move(tab)));
}

13
shell/browser/extensions/electron_messaging_delegate.cc
View file

@ -40,21 +40,20 @@ ElectronMessagingDelegate::IsNativeMessagingHostAllowed(
return PolicyPermission::DISALLOW;
}
std::unique_ptr<base::DictionaryValue>
ElectronMessagingDelegate::MaybeGetTabInfo(content::WebContents* web_contents) {
absl::optional<base::Value::Dict> ElectronMessagingDelegate::MaybeGetTabInfo(
content::WebContents* web_contents) {
if (web_contents) {
auto* api_contents = electron::api::WebContents::From(web_contents);
if (api_contents) {
api::tabs::Tab tab;
tab.id = api_contents->ID();
tab.url = std::make_unique<std::string>(api_contents->GetURL().spec());
tab.title = std::make_unique<std::string>(
base::UTF16ToUTF8(api_contents->GetTitle()));
tab.url = api_contents->GetURL().spec();
tab.title = base::UTF16ToUTF8(api_contents->GetTitle());
tab.audible = api_contents->IsCurrentlyAudible();
return tab.ToValue();
return std::move(tab.ToValue()->GetDict());
}
}
return nullptr;
return absl::nullopt;
}
content::WebContents* ElectronMessagingDelegate::GetWebContentsByTabId(

2
shell/browser/extensions/electron_messaging_delegate.h
View file

@ -27,7 +27,7 @@ class ElectronMessagingDelegate : public MessagingDelegate {
PolicyPermission IsNativeMessagingHostAllowed(
content::BrowserContext* browser_context,
const std::string& native_host_name) override;
std::unique_ptr<base::DictionaryValue> MaybeGetTabInfo(
absl::optional<base::Value::Dict> MaybeGetTabInfo(
content::WebContents* web_contents) override;
content::WebContents* GetWebContentsByTabId(
content::BrowserContext* browser_context,