61374019c0
* chore: bump chromium in DEPS to 103.0.5020.0 * chore: bump chromium in DEPS to 103.0.5022.0 * chore: bump chromium in DEPS to 103.0.5024.0 * chore: update patches * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 * chore: bump chromium in DEPS to 103.0.5026.0 * chore: update patches * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 * chore: bump chromium in DEPS to 103.0.5028.0 * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 * chore: fix authorization flags lint error * 3583363: Remove net wrappers around base/strings/escape.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * fixup! 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589 * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 * 3596174: [api] Remove APIs for resurrecting finalizers Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: bump chromium in DEPS to 103.0.5030.0 * chore: update patches * chore: bump chromium in DEPS to 103.0.5032.0 * chore: bump chromium in DEPS to 103.0.5034.0 * chore: bump chromium in DEPS to 103.0.5036.0 * chore: update patches * 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363 * 3593199: Remove content::PermissionType references and replace them with blink::PermissionType Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: lint * chore: bump chromium in DEPS to 103.0.5038.0 * chore: update patches * fixup! 3560622: serial: Add SerialPort.forget() method * 3606495: mac screen capture: add metric Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495 * chore: bump chromium in DEPS to 103.0.5040.0 * chore: update patches * 3590840: Add IPs to DnsOverHttpsServerConfig https://chromium-review.googlesource.com/c/chromium/src/+/3590840 * stub functions for ElectronSerialDelegate and SerialChooserController to fix link * 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h! Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944 * fixup! 3566412: [base] Remove base/android dependency on post_task.h and off… e3ea3e1 …icially remove post_task.h! * chore: update process_singleton patches for content::GetIOThreadTaskRunner({}) Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655 * chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo * chore: migrate Linux/Windows methods off of post_task.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * chore: bump chromium in DEPS to 103.0.5042.0 * chore: update patches * 3571804: [api] Advance API deprecation for V8 version v10.2 https://chromium-review.googlesource.com/c/v8/v8/+/3571804 * fixup! 3571804: [api] Advance API deprecation for V8 version v10.2 * build: fix run-clang-format extension matching * lint * fix windows build * how is clang-format still not working for me * chore: update patches * 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient. https://chromium-review.googlesource.com/c/chromium/src/+/3623985 * no need to implement WillProvidePublicFirstPartySets; the default is false * 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.* https://chromium-review.googlesource.com/c/chromium/src/+/3601036 * 3583363: Remove net wrappers around base/strings/escape.h https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * lint * chore: bump chromium in DEPS to 103.0.5044.0 * fix conflicts * chore: update patches * upgrade nan * pin version of nan in tests * replace my hacky deprecated override fix with the fix from upstream * revert runtime dcheck in v8 * pin nan version at root too * refactor: tell gyp to use c++17 when building with our node * Revert "refactor: tell gyp to use c++17 when building with our node" This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192. * Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192. This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348. * disable sequential/test-cpu-prof-kill for now * also sequential/test-diagnostic-dir-cpu-prof Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
156 lines
6.5 KiB
C++
156 lines
6.5 KiB
C++
// Copyright (c) 2017 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#include "shell/browser/ui/views/electron_views_delegate.h"
|
|
|
|
#include <dwmapi.h>
|
|
#include <shellapi.h>
|
|
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/task/thread_pool.h"
|
|
|
|
namespace {
|
|
|
|
bool MonitorHasAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
|
|
APPBARDATA taskbar_data = {sizeof(APPBARDATA), NULL, 0, edge};
|
|
taskbar_data.hWnd = ::GetForegroundWindow();
|
|
|
|
// MSDN documents an ABM_GETAUTOHIDEBAREX, which supposedly takes a monitor
|
|
// rect and returns autohide bars on that monitor. This sounds like a good
|
|
// idea for multi-monitor systems. Unfortunately, it appears to not work at
|
|
// least some of the time (erroneously returning NULL) and there's almost no
|
|
// online documentation or other sample code using it that suggests ways to
|
|
// address this problem. We do the following:-
|
|
// 1. Use the ABM_GETAUTOHIDEBAR message. If it works, i.e. returns a valid
|
|
// window we are done.
|
|
// 2. If the ABM_GETAUTOHIDEBAR message does not work we query the auto hide
|
|
// state of the taskbar and then retrieve its position. That call returns
|
|
// the edge on which the taskbar is present. If it matches the edge we
|
|
// are looking for, we are done.
|
|
// NOTE: This call spins a nested run loop.
|
|
HWND taskbar = reinterpret_cast<HWND>(
|
|
SHAppBarMessage(ABM_GETAUTOHIDEBAR, &taskbar_data));
|
|
if (!::IsWindow(taskbar)) {
|
|
APPBARDATA taskbar_data = {sizeof(APPBARDATA), 0, 0, 0};
|
|
unsigned int taskbar_state = SHAppBarMessage(ABM_GETSTATE, &taskbar_data);
|
|
if (!(taskbar_state & ABS_AUTOHIDE))
|
|
return false;
|
|
|
|
taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", NULL);
|
|
if (!::IsWindow(taskbar_data.hWnd))
|
|
return false;
|
|
|
|
SHAppBarMessage(ABM_GETTASKBARPOS, &taskbar_data);
|
|
if (taskbar_data.uEdge == edge)
|
|
taskbar = taskbar_data.hWnd;
|
|
}
|
|
|
|
// There is a potential race condition here:
|
|
// 1. A maximized chrome window is fullscreened.
|
|
// 2. It is switched back to maximized.
|
|
// 3. In the process the window gets a WM_NCCACLSIZE message which calls us to
|
|
// get the autohide state.
|
|
// 4. The worker thread is invoked. It calls the API to get the autohide
|
|
// state. On Windows versions earlier than Windows 7, taskbars could
|
|
// easily be always on top or not.
|
|
// This meant that we only want to look for taskbars which have the topmost
|
|
// bit set. However this causes problems in cases where the window on the
|
|
// main thread is still in the process of switching away from fullscreen.
|
|
// In this case the taskbar might not yet have the topmost bit set.
|
|
// 5. The main thread resumes and does not leave space for the taskbar and
|
|
// hence it does not pop when hovered.
|
|
//
|
|
// To address point 4 above, it is best to not check for the WS_EX_TOPMOST
|
|
// window style on the taskbar, as starting from Windows 7, the topmost
|
|
// style is always set. We don't support XP and Vista anymore.
|
|
if (::IsWindow(taskbar)) {
|
|
if (MonitorFromWindow(taskbar, MONITOR_DEFAULTTONEAREST) == monitor)
|
|
return true;
|
|
// In some cases like when the autohide taskbar is on the left of the
|
|
// secondary monitor, the MonitorFromWindow call above fails to return the
|
|
// correct monitor the taskbar is on. We fallback to MonitorFromPoint for
|
|
// the cursor position in that case, which seems to work well.
|
|
POINT cursor_pos = {0};
|
|
GetCursorPos(&cursor_pos);
|
|
if (MonitorFromPoint(cursor_pos, MONITOR_DEFAULTTONEAREST) == monitor)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
int GetAppbarAutohideEdgesOnWorkerThread(HMONITOR monitor) {
|
|
DCHECK(monitor);
|
|
|
|
int edges = 0;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_LEFT, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_LEFT;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_TOP, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_TOP;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_RIGHT, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_RIGHT;
|
|
if (MonitorHasAutohideTaskbarForEdge(ABE_BOTTOM, monitor))
|
|
edges |= views::ViewsDelegate::EDGE_BOTTOM;
|
|
return edges;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
HICON ViewsDelegate::GetDefaultWindowIcon() const {
|
|
// Use current exe's icon as default window icon.
|
|
return LoadIcon(GetModuleHandle(NULL),
|
|
MAKEINTRESOURCE(1 /* IDR_MAINFRAME */));
|
|
}
|
|
|
|
HICON ViewsDelegate::GetSmallWindowIcon() const {
|
|
return GetDefaultWindowIcon();
|
|
}
|
|
|
|
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
|
|
return false;
|
|
}
|
|
|
|
int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
|
|
base::OnceClosure callback) {
|
|
// Initialize the map with EDGE_BOTTOM. This is important, as if we return an
|
|
// initial value of 0 (no auto-hide edges) then we'll go fullscreen and
|
|
// windows will automatically remove WS_EX_TOPMOST from the appbar resulting
|
|
// in us thinking there is no auto-hide edges. By returning at least one edge
|
|
// we don't initially go fullscreen until we figure out the real auto-hide
|
|
// edges.
|
|
if (!appbar_autohide_edge_map_.count(monitor))
|
|
appbar_autohide_edge_map_[monitor] = EDGE_BOTTOM;
|
|
|
|
// We use the SHAppBarMessage API to get the taskbar autohide state. This API
|
|
// spins a modal loop which could cause callers to be reentered. To avoid
|
|
// that we retrieve the taskbar state in a worker thread.
|
|
if (monitor && !in_autohide_edges_callback_) {
|
|
// TODO(robliao): Annotate this task with .WithCOM() once supported.
|
|
// https://crbug.com/662122
|
|
base::ThreadPool::PostTaskAndReplyWithResult(
|
|
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_BLOCKING},
|
|
base::BindOnce(&GetAppbarAutohideEdgesOnWorkerThread, monitor),
|
|
base::BindOnce(&ViewsDelegate::OnGotAppbarAutohideEdges,
|
|
weak_factory_.GetWeakPtr(), std::move(callback), monitor,
|
|
appbar_autohide_edge_map_[monitor]));
|
|
}
|
|
return appbar_autohide_edge_map_[monitor];
|
|
}
|
|
|
|
void ViewsDelegate::OnGotAppbarAutohideEdges(base::OnceClosure callback,
|
|
HMONITOR monitor,
|
|
int returned_edges,
|
|
int edges) {
|
|
appbar_autohide_edge_map_[monitor] = edges;
|
|
if (returned_edges == edges)
|
|
return;
|
|
|
|
base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
} // namespace electron
|