chore: bump chromium to 110.0.5415.0 (main) (#36186)
* chore: bump chromium in DEPS to 109.0.5386.0 * chore: bump chromium in DEPS to 109.0.5388.0 * chore: bump chromium in DEPS to 109.0.5390.0 * chore: bump chromium in DEPS to 109.0.5392.0 * chore: bump chromium in DEPS to 109.0.5394.0 * chore: bump chromium in DEPS to 109.0.5396.0 * chore: bump chromium in DEPS to 109.0.5398.0 * chore: bump chromium in DEPS to 109.0.5400.0 * chore: update galactus * chore: bump chromium in DEPS to 109.0.5402.0 * chore: bump chromium in DEPS to 109.0.5403.0 * chore: bump chromium in DEPS to 109.0.5406.0 * chore: update patches * 4004247: Delete unused DocumentWebContentsDelegate Ref:4004247
* chore: bump chromium in DEPS to 109.0.5408.1 * chore: update patches * 3949284: Support pkey debug mode without pkey 0 access Ref:3949284
* chore: bump chromium in DEPS to 109.0.5410.0 * chore: update patches * 4000944: [Extensions] Create an API directory in //chrome/renderer/extensions Ref:4000944
* 3988524: Remove DocumentOverlayWindowViews |3988524
Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5412.0 * chore: update patches * 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface Ref:3984022
* 3957079: Delete the CryptoToken component extension and internal API Ref:3957079
* 4004421: Migreate ScopedAllowIO to ScopedAllowBlocking Ref:4004421
Co-authored-by: George Xu <georgexu99@users.noreply.github.com> * chore: bump chromium in DEPS to 109.0.5414.0 * chore: update patches * 4016180: Split PPAPI Mojo interfaces out of RenderFrameHostImpl. Ref:4016180
* 3970838: [MPArch] Convert HostZoomMap and ZoomController off of RenderViewHost ids Ref:3970838
* 3997795: Don't add Chromium as a login item Ref:3997795
* 3993482: Remove RefCountedString::TakeString Ref:3993482
* 3990749: Allow forward-declared sources in base::ScopedObservation<> Ref:3990749
* fixup! 3957079: Delete the CryptoToken component extension and internal API * chore: bump chromium in DEPS to 110.0.5415.0 * 3883790: Move devtools_frame_token to the RenderFrameHost, to preserve RFH identity across MPArch activations.3883790
* 4022205: Move license tooling into //tools/licenses4022205
* chore: fixup patch indices * fixup! 3957079: Delete the CryptoToken component extension and internal API * 4008687: Finish ScopedAllowIO migration4008687
* 3991548: Move WindowButtonOrderObserver and WindowFrameAction to LinuxUi3991548
* fixup! 3984022: Add AddChildWindowToBrowser to DisplayClient mojo interface * 4016595: Migrate non-default ScopedObservation<> instantiations to ScopedObservationTraits<> in chrome/browser/4016595
* 4000481: Rename :chromedriver to :chromedriver_server Ref:4000481
* 4008687: Finish ScopedAllowIO migration4008687
* 3988524: Remove DocumentOverlayWindowViews3988524
* fixup! 3997795: Don't add Chromium as a login item * chore: fixup patches * 3996872: Plumb input event task runner to EventFactoryEvdev3996872
* 4014994: Enable SiteIsolationForGuests by default.4014994
* chore: adopt new thread restrictions api for //electron (#36357) chore: add thread blocking api * fixup! 4014994: Enable SiteIsolationForGuests by default. * pull parent HWND for dialogs on ui thread * chore: set parent_window in MessageBoxSettings * chore: remove redundant patch * chore: revert accidental deletion * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: George Xu <33054982+georgexu99@users.noreply.github.com> Co-authored-by: George Xu <georgexu99@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Robo <hop2deep@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
parent
517225b99e
commit
87c183df6a
138 changed files with 818 additions and 1630 deletions
|
@ -137,7 +137,7 @@ TaskDialogCallback(HWND hwnd, UINT msg, WPARAM, LPARAM, LONG_PTR data) {
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
DialogResult ShowTaskDialogWstr(NativeWindow* parent,
|
||||
DialogResult ShowTaskDialogWstr(gfx::AcceleratedWidget parent,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::wstring>& buttons,
|
||||
int default_id,
|
||||
|
@ -160,8 +160,7 @@ DialogResult ShowTaskDialogWstr(NativeWindow* parent,
|
|||
config.dwFlags = flags;
|
||||
|
||||
if (parent) {
|
||||
config.hwndParent = static_cast<electron::NativeWindowViews*>(parent)
|
||||
->GetAcceleratedWidget();
|
||||
config.hwndParent = parent;
|
||||
}
|
||||
|
||||
if (default_id > 0)
|
||||
|
@ -254,6 +253,7 @@ DialogResult ShowTaskDialogWstr(NativeWindow* parent,
|
|||
}
|
||||
|
||||
DialogResult ShowTaskDialogUTF8(const MessageBoxSettings& settings,
|
||||
gfx::AcceleratedWidget parent_widget,
|
||||
HWND* hwnd) {
|
||||
std::vector<std::wstring> buttons;
|
||||
for (const auto& button : settings.buttons)
|
||||
|
@ -266,7 +266,7 @@ DialogResult ShowTaskDialogUTF8(const MessageBoxSettings& settings,
|
|||
base::UTF8ToUTF16(settings.checkbox_label);
|
||||
|
||||
return ShowTaskDialogWstr(
|
||||
settings.parent_window, settings.type, buttons, settings.default_id,
|
||||
parent_widget, settings.type, buttons, settings.default_id,
|
||||
settings.cancel_id, settings.no_link, title, message, detail,
|
||||
checkbox_label, settings.checkbox_checked, settings.icon, hwnd);
|
||||
}
|
||||
|
@ -274,7 +274,12 @@ DialogResult ShowTaskDialogUTF8(const MessageBoxSettings& settings,
|
|||
} // namespace
|
||||
|
||||
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
||||
DialogResult result = ShowTaskDialogUTF8(settings, nullptr);
|
||||
gfx::AcceleratedWidget parent_widget =
|
||||
settings.parent_window
|
||||
? static_cast<electron::NativeWindowViews*>(settings.parent_window)
|
||||
->GetAcceleratedWidget()
|
||||
: nullptr;
|
||||
DialogResult result = ShowTaskDialogUTF8(settings, parent_widget, nullptr);
|
||||
return result.button_id;
|
||||
}
|
||||
|
||||
|
@ -291,17 +296,23 @@ void ShowMessageBox(const MessageBoxSettings& settings,
|
|||
hwnd = it.first->second.get();
|
||||
}
|
||||
|
||||
dialog_thread::Run(
|
||||
base::BindOnce(&ShowTaskDialogUTF8, settings, base::Unretained(hwnd)),
|
||||
base::BindOnce(
|
||||
[](MessageBoxCallback callback, absl::optional<int> id,
|
||||
DialogResult result) {
|
||||
if (id)
|
||||
GetDialogsMap().erase(*id);
|
||||
std::move(callback).Run(result.button_id,
|
||||
result.verification_flag_checked);
|
||||
},
|
||||
std::move(callback), settings.id));
|
||||
gfx::AcceleratedWidget parent_widget =
|
||||
settings.parent_window
|
||||
? static_cast<electron::NativeWindowViews*>(settings.parent_window)
|
||||
->GetAcceleratedWidget()
|
||||
: nullptr;
|
||||
dialog_thread::Run(base::BindOnce(&ShowTaskDialogUTF8, settings,
|
||||
parent_widget, base::Unretained(hwnd)),
|
||||
base::BindOnce(
|
||||
[](MessageBoxCallback callback, absl::optional<int> id,
|
||||
DialogResult result) {
|
||||
if (id)
|
||||
GetDialogsMap().erase(*id);
|
||||
std::move(callback).Run(
|
||||
result.button_id,
|
||||
result.verification_flag_checked);
|
||||
},
|
||||
std::move(callback), settings.id));
|
||||
}
|
||||
|
||||
void CloseMessageBox(int id) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue