github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: chrome.tabs.update return value (#39389)

Browse Source 
fix: chrome.tabs.update return value

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot]
2023-08-07 12:38:19 +02:00
committed by GitHub
parent 4586a40bfd
commit 66f42b3256
4 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shell/browser/extensions/api/tabs/tabs_api.cc
View File

@@ -57,6 +57,14 @@ void ZoomModeToZoomSettings(WebContentsZoomController::ZoomMode zoom_mode,
break;
}
}
api::tabs::MutedInfo CreateMutedInfo(content::WebContents* contents) {
DCHECK(contents);
api::tabs::MutedInfo info;
info.muted = contents->IsAudioMuted();
info.reason = api::tabs::MUTED_INFO_REASON_USER;
return info;
}
} // namespace
ExecuteCodeInTabFunction::ExecuteCodeInTabFunction() : execute_tab_id_(-1) {}
@@ -502,11 +510,17 @@ ExtensionFunction::ResponseValue TabsUpdateFunction::GetResult() {
auto* api_web_contents = electron::api::WebContents::From(web_contents_);
tab.id = (api_web_contents ? api_web_contents->ID() : -1);
// 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 = web_contents_->GetLastCommittedURL().spec();
if (api_web_contents)
tab.active = api_web_contents->IsFocused();
tab.muted_info = CreateMutedInfo(web_contents_);
tab.audible = web_contents_->IsCurrentlyAudible();
return ArgumentList(tabs::Get::Results::Create(std::move(tab)));
}