ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
71 lines
2.5 KiB
C++
71 lines
2.5 KiB
C++
// Copyright (c) 2016 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 file.
|
|
|
|
// Modified from chrome/browser/ui/views/frame/windows_10_caption_button.h
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_CAPTION_BUTTON_H_
|
|
#define ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_CAPTION_BUTTON_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "chrome/browser/ui/frame/window_frame_util.h"
|
|
#include "chrome/browser/ui/view_ids.h"
|
|
#include "shell/browser/ui/views/win_icon_painter.h"
|
|
#include "ui/base/metadata/metadata_header_macros.h"
|
|
#include "ui/gfx/canvas.h"
|
|
#include "ui/views/controls/button/button.h"
|
|
|
|
namespace electron {
|
|
|
|
class WinFrameView;
|
|
|
|
class WinCaptionButton : public views::Button {
|
|
public:
|
|
WinCaptionButton(PressedCallback callback,
|
|
WinFrameView* frame_view,
|
|
ViewID button_type,
|
|
const std::u16string& accessible_name);
|
|
~WinCaptionButton() override;
|
|
|
|
WinCaptionButton(const WinCaptionButton&) = delete;
|
|
WinCaptionButton& operator=(const WinCaptionButton&) = delete;
|
|
|
|
// // views::Button:
|
|
gfx::Size CalculatePreferredSize() const override;
|
|
void OnPaintBackground(gfx::Canvas* canvas) override;
|
|
void PaintButtonContents(gfx::Canvas* canvas) override;
|
|
|
|
gfx::Size GetSize() const;
|
|
void SetSize(gfx::Size size);
|
|
|
|
private:
|
|
std::unique_ptr<WinIconPainter> CreateIconPainter();
|
|
// Returns the amount we should visually reserve on the left (right in RTL)
|
|
// for spacing between buttons. We do this instead of repositioning the
|
|
// buttons to avoid the sliver of deadspace that would result.
|
|
int GetBetweenButtonSpacing() const;
|
|
|
|
// Returns the order in which this button will be displayed (with 0 being
|
|
// drawn farthest to the left, and larger indices being drawn to the right of
|
|
// smaller indices).
|
|
int GetButtonDisplayOrderIndex() const;
|
|
|
|
// The base color to use for the button symbols and background blending. Uses
|
|
// the more readable of black and white.
|
|
SkColor GetBaseColor() const;
|
|
|
|
// Paints the minimize/maximize/restore/close icon for the button.
|
|
void PaintSymbol(gfx::Canvas* canvas);
|
|
|
|
raw_ptr<WinFrameView> frame_view_;
|
|
std::unique_ptr<WinIconPainter> icon_painter_;
|
|
ViewID button_type_;
|
|
|
|
int base_width_ = WindowFrameUtil::kWindowsCaptionButtonWidth;
|
|
int height_ = WindowFrameUtil::kWindowsCaptionButtonHeightRestored;
|
|
};
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_CAPTION_BUTTON_H_
|