2019-11-19 14:07:10 +00:00
|
|
|
// 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.
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/browser/ui/views/electron_views_delegate.h"
|
2019-11-19 14:07:10 +00:00
|
|
|
|
|
|
|
#include <dwmapi.h>
|
|
|
|
#include <shellapi.h>
|
|
|
|
|
|
|
|
#include <utility>
|
|
|
|
|
|
|
|
#include "base/bind.h"
|
|
|
|
#include "base/task/post_task.h"
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* chore: remove content_browser_main_loop.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
The function being patched (BrowserMainLoop::MainMessageLoopRun()) no
longer exists.
NB: if removing this introduces regressions the likely fix will be to
add a similar patch for ShellBrowserMainParts::WillRunMainMessageLoop()
which has similar code and was added at the same time this was removed.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* chore: remove v8/skip_global_registration_of_shared_arraybuffer_backing_stores.patch
Refs: https://chromium-review.googlesource.com/c/v8/v8/+/2763874
This patch has been merged upstream
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785841
SkColorFromColorId() no longer takes theme, scheme args
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2772143
Change new calls to GetDarkSchemeColor to fit our patched call signature
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_ in our mojom
* chore: update chromium/frame_host_manager.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update chromium/revert_remove_contentrendererclient_shouldfork.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2755314
Upstream has removed `history_list_length_` which we were comparing to 0
to calculate our `is_initial_navigation` bool when calling ShouldFork().
ShouldFork() is ours and none of the code paths actually use that param,
so this commit removes it altogether.
* chore: update permissions_to_register
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2789074
Replace all uses of APIPermission::ID enum with Mojo type
* refactor: update return type of PreMainMessageLoopRun()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
Used to return void; now returns an int errorcode.
Note: 2725153 also has some nice doc updates about Browser's "stages"
* refactor: sync ElectronBrowserMainParts to MainParts changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
RunMainMessageLoopParts has been replaced with WillRunMainMessageLoop
so `BrowserMainLoop::result_code_` is no longer available to us for our
exit_code_ pointer.
This variable held a dual role: (1) of course, hold the exit code, but
also (2) was a nullptr before the message loop was ready, indicating to
anyone calling SetExitCode() that we were still in startup and could
just exit() without any extra steps. exit_code_ still fulfills these two
roles but is now a base::Optional.
* chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
BrowserMainParts::BrowsePreDefaultMainMesssageLoopRun() has been
removed; move that work to the new WillRunMainMessageLoop().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* refactor: update use of threadpools.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2773408
The upstream code is still in flux (e.g. reverts and re-lands) but the
tl;dr for this commit is (1) include thread_pool.h if you're using it
and (2) don't instantiate pools directly.
* refactor: remove routing_id from CreateLoaderAndStart
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
NB: One logic branch in ProxyingURLLoaderFactory::CreateLoaderAndStart
calls std::make_unique<InProgressRequest>, which needs a routing_id.
This PR uses the member field `routing_id_` since there's no longer one
being passed into CreateLoaderAndStart.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* refactor: sync with upstream UrlInfo ctor changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update invocation of convert_protocol_to_json.py
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2792623
python3 is being used in parts of the upstream build, but the copy of
convert_protocol_to_json.py invoked in v8/third_party/inspector_protocol
is not python3-friendly. Node has a py2+3-friendly version of it in its
tools directory, so call it instead.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* chore: Remove support for TLS1.0/1.1 in SSLVersionMin policy
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2765737
Remove TLS v1.0 & 1.1 from our SSLProtocolVersionFromString() function.
This is the same change made upstream at
https://chromium-review.googlesource.com/c/chromium/src/+/2765737/8/chrome/browser/ssl/ssl_config_service_manager_pref.cc
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* chore: Use IDType for permission change subscriptions.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791431
tldr: {Subscribe,Unsubscribe}PermissionStatusChange's tag type used to
be an int; now it's the new SubscriptionId type (which is an IdType64).
* chore: sync PowerMonitor code to upstream refactor
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2752635
tldr: PowerMonitor has been split into PowerStateObserver,
PowerSuspendObserver, and PowerThermalObserver to reduce number of tasks
posted to consumers who only need notifications for one of those things
instead of all of them.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* chore: update chromium/gtk_visibility.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796200
tldr: no code changes; just updating the diff to apply cleanly.
note: ooh upstream Wayland hacking!
* chore: update chromium/picture-in-picture.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710023
tldr: no code changes; just updating the diff to apply cleanly.
* chore: update chromium/worker_feat_add_hook_to_notify_script_ready.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2775573
tldr: no code changes; just updating the diff to apply cleanly.
* chore: export_all_patches
* chore: update chromium/feat_add_set_theme_source_to_allow_apps_to.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796511
tldr: NotifyObservers has been renamed to NotifyOnNativeThemeUpdated,
so update the invocation in our patch.
* chore: update ElectronBrowserClient w/upstream API
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797454
tldr: GetDevToolsManagerDelegate() was returning an owned raw pointer.
Replaced it with CreateDevToolsManagerDelegate() which uses unique_ptr<>.
* chore: handle new content::PermissionType::FILE_HANDLING in toV8()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762201
`file-handling` string confirmed in https://chromium-review.googlesource.com/c/chromium/src/+/2762201/18/chrome/browser/ui/webui/settings/site_settings_helper.cc
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 2733595: [ch-r] Parse ACCEPT_CH H2/3 frame and restart with new headers if needed
https://chromium-review.googlesource.com/c/chromium/src/+/2733595
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* build: fix missing symbols on linux build
* use_ozone and use_x11 are not exclusive
* new button view to build for pip
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* fix: invalid usage of non-targetted PostTask
You must always either use a host threadpool or specify a target
thread. In this case we did neither after this refactor.
Refs: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
2021-04-15 17:44:35 +00:00
|
|
|
#include "base/task/thread_pool.h"
|
2019-11-19 14:07:10 +00:00
|
|
|
|
|
|
|
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
|
2020-03-09 16:13:59 +00:00
|
|
|
base::ThreadPool::PostTaskAndReplyWithResult(
|
|
|
|
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_BLOCKING},
|
2019-11-19 14:07:10 +00:00
|
|
|
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
|