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

refactor: use default printing path when no user options (#46587)

Browse Source
This commit is contained in:
Shelley Vohr
2025-04-11 16:14:29 +02:00
committed by GitHub
parent 74d641c7b3
commit 3064b24c9d
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shell/browser/api/electron_api_web_contents.cc
View File

@@ -2944,9 +2944,8 @@ void OnGetDeviceNameToUse(base::WeakPtr<content::WebContents> web_contents,
return;
}
// If the user has passed a deviceName use it, otherwise use default printer.
// Use user-passed deviceName, otherwise default printer.
print_settings.Set(printing::kSettingDeviceName, info.second);
if (!print_settings.FindInt(printing::kSettingDpiHorizontal)) {
gfx::Size dpi = GetDefaultPrinterDPI(info.second);
print_settings.Set(printing::kSettingDpiHorizontal, dpi.width());
@@ -3005,6 +3004,17 @@ void WebContents::Print(gin::Arguments* args) {
return;
}
if (options.IsEmptyObject()) {
auto* print_view_manager =
PrintViewManagerElectron::FromWebContents(web_contents());
if (!print_view_manager)
return;
content::RenderFrameHost* rfh = GetRenderFrameHostToUse(web_contents());
print_view_manager->PrintNow(rfh, std::move(settings), std::move(callback));
return;
}
// Set optional silent printing.
bool silent = false;
options.Get("silent", &silent);