chore: bump chromium to 127.0.6521.0 (main) (#42118)
* chore: bump chromium in DEPS to 126.0.6470.0 * 5492605: Migrate TODOs referencing old crbug IDs to the new issue tracker IDs |5492605
* 5513277: Move subresource-filter-ruleset to GCS |5513277
* 5512656: Remove CustomizeChromeSupportsChromeRefresh2023 |5512656
* 5516009: Accept mouse events in inactive window for Top Chrome WebUIs |5516009
* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI. |5376861
* 5490530: Use partition_alloc PA_BUILDFLAG(...) outside PA. #cleanup |5490530
* 5296870: network: Allow trusted loaders to learn the sent request cookies. |5296870
* 5453438: Delegate delegated ink trails to RWHI from RWHIER. |5453438
* chore: update patches * chore: bump chromium in DEPS to 126.0.6472.0 * chore: bump chromium in DEPS to 126.0.6474.0 * chore: update patches * chore: bump chromium in DEPS to 126.0.6476.0 * chore: bump chromium in DEPS to 126.0.6478.0 * chore: bump chromium in DEPS to 126.0.6478.3 * chore: bump chromium in DEPS to 126.0.6478.8 * update patches * only disable enterprise_cloud_content_analysis * 5403888: [api] support v8::Data in v8::TracedReference and v8::EmbedderGraph5403888
* chore: bump chromium in DEPS to 127.0.6484.0 * chore: bump chromium in DEPS to 127.0.6485.0 * 5539004: Use NOTREACHED_IN_MIGRATION() in remaining chrome/ |5539004
* src: cast to v8::Value before using v8::EmbedderGraph::V8Node | https://github.com/nodejs/node/pull/52638/files * chore: update patches * chore: update v8 patches * chore: bump chromium in DEPS to 127.0.6486.0 * chore: bump chromium in DEPS to 127.0.6488.0 * chore: bump chromium in DEPS to 127.0.6490.0 * chore: bump chromium in DEPS to 127.0.6492.0 * chore: update patches For some reason, `feat_expose_raw_response_headers_from_urlloader.patch` got messed up in an earlier commit. * chore: update patches printing.patch was updated due to5535938
* 5527572: Move Connectors prefs files to components/enterprise/connectors/5527572
* chore: bump chromium in DEPS to 127.0.6494.0 * chore: bump chromium in DEPS to 127.0.6495.0 * chore: bump chromium in DEPS to 127.0.6496.0 * 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation5465511
* chore: revert v8 deprecation See patch message for more details.5526611
* chore: update patches * 5538771: Remove srcdoc else-if block in CalculateOrigin()5538771
* 5522321: [devtools] Support saving base64 encoded files via host bindings5522321
* 5376861: Change references to RWHVB in RWHIER and RenderWidgetTargeter to RWHVI.5376861
* 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum5530163
* 5463431: iwa: Only create IsolatedWebAppURLLoaderFactory for subresources in IWAs5463431
* fixup! 5465511: [api] Mark v8::ObjectTemplate::SetAccessor(..) for deprecation5465511
* 5512176: Remove OnEnvironmentEstimationComplete()5512176
* 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282
* 5513740: Reland "[Extensions] Restructure extensions::ProcessMap"5513740
* 5483406: [PEPC] Make PEPC permission subscription take into account device status5483406
* 5526034: [DoH] Remove kDnsOverHttps feature flag5526034
The title is a bit misleading. They removed handling for the feature flag and generally intend to remove it but haven't yet. I only changed our code to address the flag that was removed. A quick search on GitHub for `DnsOverHttpsFallback` yielded a few results, but they were all C++ chromium code or patches, 0 app code or discussion results. Since I couldn't find any evidence of this flag being used in developer applications, I've chosen to exclude this change from the breaking changes docs. * chore: revert v8 removal5497515
See patch message for more details. * chore: cherry-pick Node.js patch for V8 API removal fix Node.js PR: https://github.com/nodejs/node/pull/52996 V8 API Removal CL:5539888
See the patch description for more details. * 5492183: Extensions: CodeHealth: Give enums some class5492183
* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282
* 5514687: Reland "Add a secret handshake to the base::Feature constructor"5514687
* fixup! 5530163: [media] Use VideoFrame::Plane typed enum instead of nameless enum5530163
* 5466238: PDF Viewer: add metrics to record if PDF is opened with a11y5466238
* 5502081: Migrate OnDisplayRemoved to OnDisplaysRemoved5502081
* 5539888: [api] Remove several APIs deprecated in version 12.65539888
This commit essentially only removes the `only_terminate_in_safe_scope` isolate creation parameter. This undoes some work that was originally done in #35766. * 5498236: Make browser_tests force full async initialization for OSCrypt Async5498236
* fixup! 5528282: Move Web Speech API .mojom files to //media/mojo/mojom5528282
* 5545807: Migrate most remaining NOTREACHED()5545807
I took a systematic approach to modifying all of our uses of `NOTREACHED` that were causing errors: * If there was a `return` or `break` (etc.) immediately after `NOTREACHED`, I removed the control flow instruction and left the `NOTREACHED` unmodified * All other instances were migrated to `NOTREACHED_IN_MIGRATION` We should revisit pretty much all usage of `NOTREACHED` as an upgrade follow-up item. * fixup! 5526034: [DoH] Remove kDnsOverHttps feature flag5526034
Turns out the feature flags were removed in the `.cc` file, but not the `.h` feature list file. This means that the feature flags are pretty much officially gone. (The leftover symbols in the header are likely an oversight from what I can gather.) We may potentially decide to put this in the breaking changes doc if we decide this feature flag is important enough to highlight. * chore: bump chromium in DEPS to 127.0.6498.3 * chore: bump chromium in DEPS to 127.0.6500.0 * chore: bump chromium in DEPS to 127.0.6502.0 * chore: bump chromium in DEPS to 127.0.6504.0 * chore: bump chromium in DEPS to 127.0.6505.0 * chore: bump chromium in DEPS to 127.0.6508.0 * build: use Sha256Sum in script/sysroots.json Xref:5506275
* chore: update chore_add_electron_deps_to_gitignores.patch Xref: no manual changes; patch applied with fuzz 2 * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: no manual changes; patch applied with fuzz 1 * chore: e patches all * fixup! build: use Sha256Sum in script/sysroots.json `sync` succeeds now * chore: replace absl::optional with std::optional Xref:5253843
* chore: update CalculatePreferredSize() to new upstream semantics Xref:5459174
Xref:5541220
Xref:5514708
Xref:5504212
Xref: https://chromium-review.googlesource.com/516542 * chore: replace absl::optional with std::optional Xref:5296147
* chore: add kPip to enumeration as a no-op5546257
* [Autofill] Remove RenderFrame::ElementBoundsInWindow() Xref:5553982
* chore: fix feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch need new header to pick up definition of BLINK_PLATFORM_EXPORT macro Xref:5463143
* chore: bump chromium in DEPS to 127.0.6510.0 * chore: update patches * chore: fix include path for native_web_keyboard_event.h Xref:5541976
* chore: add currently-unused should_include_device_status arg to GetPermissionStatusForCurrentDocument() Xref:5545382
* chore: bump chromium in DEPS to 127.0.6512.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch No manual changes; patch applied with fuzz 1 * chore: update feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch No manual changes; patch applied with fuzz 1 * chore: update webview_fullscreen.patch No manual changes; patch applied with fuzz 1 * chore=: remove cherry-pick-22db6918bac9.patch already present upstream * chore: remove nonexistent patchfiles from .patches * chore: remove cherry-pick-3e037e195e50.patch no longer needed; merged upstream * Update namespace for files moved to //components/input Xref:5563251
* Require client for InitParams to always specify an ownership mode. Xref:5532482
Xref:5578714
* chore: e patches all * fixup! Update namespace for files moved to //components/input * chore: remove profile_keyed_service_factory, profile_selections from chromium_src already being linked in via chrome browser for printing * chore: bump chromium in DEPS to 127.0.6515.0 * chore: bump chromium in DEPS to 127.0.6516.0 * chore: update render_widget_host_view_base.patch Xref:5547803
patch applied manually due to simple upstream shear * chore: update feat_allow_code_cache_in_custom_schemes.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * Pull RWHIER and RWT to //content/common/input. Xref:5397681
* chore: bump chromium in DEPS to 127.0.6517.0 * chore: update patches * fixup: Update namespace for files moved to //components/input * Remove 0-arg (default) constructor for views::Widget::InitParams.5578714
* fixup: only disable enterprise_cloud_content_analysis The original commita5480accc2
, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ |5527572
* chore: bump chromium in DEPS to 127.0.6519.0 * chore: update patches * src: do not use deprecated V8 API https://github.com/nodejs/node/pull/53084 * src: remove dependency on wrapper-descriptor-based cpp heap https://github.com/nodejs/node/pull/53086 * 5344413: [DevTools] Add `getHostConfig` UI binding for sending status of `base::Features` to DevTools5344413
* 5585788: Extensions: ManifestHandler: Separate Registry like ExtensionRegistry5585788
* chore: update filenames.libcxx.gni * 5506857: Reland "Migrate clang-format to gcs first class deps"5506857
* fixup: 5539888: [api] Remove several APIs deprecated in version 12.6 * fixup: 5506857: Reland Migrate clang-format to gcs first class deps * chore: bump chromium in DEPS to 127.0.6521.0 * chore: update patches * spec: update navigator.keyboard should lock the keyboard * Block or allow all MIDI using the existing SysEx permission Refs5154368
Refs5499157
* spec: update test/parallel/test-v8-stats * views: remove CalculatePreferredSize() Refs5504212
* chore: update patches after rebase * 5560288: Re-enable ChromeOS XNNPack on Intel only5560288
* chore: add nan patches for v8 changes Refs 5539888: [api] Remove several APIs deprecated in version 12.6 |5539888
and 5539852: [heap][api] Remove deprecated v8::Isolate::IdleNotificationDeadline |5539852
* 5573603: Modularize //chrome/browser/themes5573603
* 5539888: [api] Remove several APIs deprecated in version 12.65539888
* chore: update patches * test: fixup navigator.keyboard.lock on Windows * chore: remove unneeded profile target --------- 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: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
84e15e2d04
commit
c3b4cd987c
202 changed files with 1843 additions and 1127 deletions
|
@ -119,6 +119,7 @@ void ElectronDesktopWindowTreeHostLinux::UpdateWindowState(
|
|||
case ui::PlatformWindowState::kSnappedPrimary:
|
||||
case ui::PlatformWindowState::kSnappedSecondary:
|
||||
case ui::PlatformWindowState::kFloated:
|
||||
case ui::PlatformWindowState::kPip:
|
||||
case ui::PlatformWindowState::kPinnedFullscreen:
|
||||
case ui::PlatformWindowState::kTrustedPinnedFullscreen:
|
||||
break;
|
||||
|
@ -138,6 +139,7 @@ void ElectronDesktopWindowTreeHostLinux::UpdateWindowState(
|
|||
case ui::PlatformWindowState::kSnappedPrimary:
|
||||
case ui::PlatformWindowState::kSnappedSecondary:
|
||||
case ui::PlatformWindowState::kFloated:
|
||||
case ui::PlatformWindowState::kPip:
|
||||
case ui::PlatformWindowState::kPinnedFullscreen:
|
||||
case ui::PlatformWindowState::kTrustedPinnedFullscreen:
|
||||
break;
|
||||
|
|
|
@ -78,7 +78,6 @@ static HRESULT GetFileNameFromShellItem(IShellItem* pShellItem,
|
|||
wcscpy_s(lpstr, cchLength, lpstrName);
|
||||
} else {
|
||||
NOTREACHED();
|
||||
hRet = DISP_E_BUFFERTOOSMALL;
|
||||
}
|
||||
|
||||
::CoTaskMemFree(lpstrName);
|
||||
|
|
|
@ -732,9 +732,10 @@ void InspectableWebContents::ShowItemInFolder(
|
|||
|
||||
void InspectableWebContents::SaveToFile(const std::string& url,
|
||||
const std::string& content,
|
||||
bool save_as) {
|
||||
bool save_as,
|
||||
bool is_base64) {
|
||||
if (delegate_)
|
||||
delegate_->DevToolsSaveToFile(url, content, save_as);
|
||||
delegate_->DevToolsSaveToFile(url, content, save_as, is_base64);
|
||||
}
|
||||
|
||||
void InspectableWebContents::AppendToFile(const std::string& url,
|
||||
|
@ -887,6 +888,12 @@ void InspectableWebContents::GetSyncInformation(DispatchCallback callback) {
|
|||
std::move(callback).Run(&result);
|
||||
}
|
||||
|
||||
void InspectableWebContents::GetHostConfig(DispatchCallback callback) {
|
||||
base::Value::Dict response_dict;
|
||||
base::Value response = base::Value(std::move(response_dict));
|
||||
std::move(callback).Run(&response);
|
||||
}
|
||||
|
||||
void InspectableWebContents::ConnectionReady() {}
|
||||
|
||||
void InspectableWebContents::RegisterExtensionsAPI(const std::string& origin,
|
||||
|
@ -977,7 +984,7 @@ void InspectableWebContents::WebContentsDestroyed() {
|
|||
|
||||
bool InspectableWebContents::HandleKeyboardEvent(
|
||||
content::WebContents* source,
|
||||
const content::NativeWebKeyboardEvent& event) {
|
||||
const input::NativeWebKeyboardEvent& event) {
|
||||
auto* delegate = web_contents_->GetDelegate();
|
||||
return !delegate || delegate->HandleKeyboardEvent(source, event);
|
||||
}
|
||||
|
|
|
@ -103,7 +103,8 @@ class InspectableWebContents
|
|||
void ShowItemInFolder(const std::string& file_system_path) override;
|
||||
void SaveToFile(const std::string& url,
|
||||
const std::string& content,
|
||||
bool save_as) override;
|
||||
bool save_as,
|
||||
bool is_base64) override;
|
||||
void AppendToFile(const std::string& url,
|
||||
const std::string& content) override;
|
||||
void RequestFileSystems() override;
|
||||
|
@ -154,6 +155,7 @@ class InspectableWebContents
|
|||
void RemovePreference(const std::string& name) override;
|
||||
void ClearPreferences() override;
|
||||
void GetSyncInformation(DispatchCallback callback) override;
|
||||
void GetHostConfig(DispatchCallback callback) override;
|
||||
void ConnectionReady() override;
|
||||
void RegisterExtensionsAPI(const std::string& origin,
|
||||
const std::string& script) override;
|
||||
|
@ -203,7 +205,7 @@ class InspectableWebContents
|
|||
|
||||
// content::WebContentsDelegate:
|
||||
bool HandleKeyboardEvent(content::WebContents*,
|
||||
const content::NativeWebKeyboardEvent&) override;
|
||||
const input::NativeWebKeyboardEvent&) override;
|
||||
void CloseContents(content::WebContents* source) override;
|
||||
void RunFileChooser(content::RenderFrameHost* render_frame_host,
|
||||
scoped_refptr<content::FileSelectListener> listener,
|
||||
|
|
|
@ -20,7 +20,8 @@ class InspectableWebContentsDelegate {
|
|||
virtual void DevToolsReloadPage() {}
|
||||
virtual void DevToolsSaveToFile(const std::string& url,
|
||||
const std::string& content,
|
||||
bool save_as) {}
|
||||
bool save_as,
|
||||
bool is_base64) {}
|
||||
virtual void DevToolsAppendToFile(const std::string& url,
|
||||
const std::string& content) {}
|
||||
virtual void DevToolsRequestFileSystems() {}
|
||||
|
|
|
@ -170,8 +170,8 @@ void InspectableWebContentsView::SetIsDocked(bool docked, bool activate) {
|
|||
devtools_window_delegate_ = new DevToolsWindowDelegate(
|
||||
this, devtools_window_web_view_, devtools_window_.get());
|
||||
|
||||
views::Widget::InitParams params;
|
||||
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
||||
views::Widget::InitParams params{
|
||||
views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET};
|
||||
params.delegate = devtools_window_delegate_;
|
||||
params.bounds = inspectable_web_contents()->dev_tools_bounds();
|
||||
|
||||
|
|
|
@ -366,7 +366,7 @@ bool AutofillPopupView::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
|||
}
|
||||
|
||||
bool AutofillPopupView::HandleKeyPressEvent(
|
||||
const content::NativeWebKeyboardEvent& event) {
|
||||
const input::NativeWebKeyboardEvent& event) {
|
||||
if (!popup_)
|
||||
return false;
|
||||
switch (event.windows_key_code) {
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
#include "shell/browser/ui/autofill_popup.h"
|
||||
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "components/input/native_web_keyboard_event.h"
|
||||
#include "content/public/browser/render_widget_host.h"
|
||||
#include "content/public/common/input/native_web_keyboard_event.h"
|
||||
#include "electron/buildflags/buildflags.h"
|
||||
#include "shell/browser/osr/osr_view_proxy.h"
|
||||
#include "ui/accessibility/ax_node_data.h"
|
||||
|
@ -110,7 +110,7 @@ class AutofillPopupView : public views::WidgetDelegateView,
|
|||
void OnMouseReleased(const ui::MouseEvent& event) override;
|
||||
void OnGestureEvent(ui::GestureEvent* event) override;
|
||||
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
|
||||
bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event);
|
||||
bool HandleKeyPressEvent(const input::NativeWebKeyboardEvent& event);
|
||||
|
||||
// views::WidgetFocusChangeListener implementation.
|
||||
void OnNativeFocusChanged(gfx::NativeView focused_now) override;
|
||||
|
|
|
@ -58,7 +58,6 @@ ui::NavButtonProvider::ButtonState ButtonStateToNavButtonProviderState(
|
|||
case views::Button::STATE_COUNT:
|
||||
default:
|
||||
NOTREACHED();
|
||||
return ui::NavButtonProvider::ButtonState::kNormal;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -258,8 +257,10 @@ void ClientFrameViewLinux::SizeConstraintsChanged() {
|
|||
InvalidateLayout();
|
||||
}
|
||||
|
||||
gfx::Size ClientFrameViewLinux::CalculatePreferredSize() const {
|
||||
return SizeWithDecorations(FramelessView::CalculatePreferredSize());
|
||||
gfx::Size ClientFrameViewLinux::CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const {
|
||||
return SizeWithDecorations(
|
||||
FramelessView::CalculatePreferredSize(available_size));
|
||||
}
|
||||
|
||||
gfx::Size ClientFrameViewLinux::GetMinimumSize() const {
|
||||
|
|
|
@ -71,7 +71,8 @@ class ClientFrameViewLinux : public FramelessView,
|
|||
void SizeConstraintsChanged() override;
|
||||
|
||||
// Overridden from View:
|
||||
gfx::Size CalculatePreferredSize() const override;
|
||||
gfx::Size CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const override;
|
||||
gfx::Size GetMinimumSize() const override;
|
||||
gfx::Size GetMaximumSize() const override;
|
||||
void Layout(PassKey) override;
|
||||
|
|
|
@ -109,10 +109,11 @@ views::View* FramelessView::TargetForRect(views::View* root,
|
|||
return NonClientFrameView::TargetForRect(root, rect);
|
||||
}
|
||||
|
||||
gfx::Size FramelessView::CalculatePreferredSize() const {
|
||||
gfx::Size FramelessView::CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const {
|
||||
return frame_->non_client_view()
|
||||
->GetWindowBoundsForClientBounds(
|
||||
gfx::Rect(frame_->client_view()->GetPreferredSize()))
|
||||
->GetWindowBoundsForClientBounds(gfx::Rect(
|
||||
frame_->client_view()->CalculatePreferredSize(available_size)))
|
||||
.size();
|
||||
}
|
||||
|
||||
|
|
|
@ -54,7 +54,8 @@ class FramelessView : public views::NonClientFrameView {
|
|||
views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
|
||||
|
||||
// views::View:
|
||||
gfx::Size CalculatePreferredSize() const override;
|
||||
gfx::Size CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const override;
|
||||
gfx::Size GetMinimumSize() const override;
|
||||
gfx::Size GetMaximumSize() const override;
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
#include "content/public/common/input/native_web_keyboard_event.h"
|
||||
#include "components/input/native_web_keyboard_event.h"
|
||||
#include "shell/browser/native_window.h"
|
||||
#include "shell/browser/ui/views/menu_bar.h"
|
||||
#include "ui/views/layout/box_layout.h"
|
||||
|
@ -15,12 +15,12 @@ namespace electron {
|
|||
|
||||
namespace {
|
||||
|
||||
bool IsAltKey(const content::NativeWebKeyboardEvent& event) {
|
||||
bool IsAltKey(const input::NativeWebKeyboardEvent& event) {
|
||||
return event.windows_key_code == ui::VKEY_MENU;
|
||||
}
|
||||
|
||||
bool IsAltModifier(const content::NativeWebKeyboardEvent& event) {
|
||||
typedef content::NativeWebKeyboardEvent::Modifiers Modifiers;
|
||||
bool IsAltModifier(const input::NativeWebKeyboardEvent& event) {
|
||||
using Modifiers = input::NativeWebKeyboardEvent::Modifiers;
|
||||
int modifiers = event.GetModifiers();
|
||||
modifiers &= ~Modifiers::kNumLockOn;
|
||||
modifiers &= ~Modifiers::kCapsLockOn;
|
||||
|
@ -98,7 +98,7 @@ void RootView::SetMenuBarVisibility(bool visible) {
|
|||
InvalidateLayout();
|
||||
}
|
||||
|
||||
void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
|
||||
void RootView::HandleKeyEvent(const input::NativeWebKeyboardEvent& event) {
|
||||
if (!menu_bar_)
|
||||
return;
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "ui/views/view.h"
|
||||
#include "ui/views/view_tracker.h"
|
||||
|
||||
namespace content {
|
||||
namespace input {
|
||||
struct NativeWebKeyboardEvent;
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ class RootView : public views::View {
|
|||
bool is_menu_bar_auto_hide() const { return menu_bar_autohide_; }
|
||||
void SetMenuBarVisibility(bool visible);
|
||||
bool is_menu_bar_visible() const { return menu_bar_visible_; }
|
||||
void HandleKeyEvent(const content::NativeWebKeyboardEvent& event);
|
||||
void HandleKeyEvent(const input::NativeWebKeyboardEvent& event);
|
||||
void ResetAltState();
|
||||
void RestoreFocus();
|
||||
// Register/Unregister accelerators supported by the menu model.
|
||||
|
|
|
@ -46,7 +46,8 @@ std::unique_ptr<WinIconPainter> WinCaptionButton::CreateIconPainter() {
|
|||
return std::make_unique<WinIconPainter>();
|
||||
}
|
||||
|
||||
gfx::Size WinCaptionButton::CalculatePreferredSize() const {
|
||||
gfx::Size WinCaptionButton::CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const {
|
||||
// TODO(bsep): The sizes in this function are for 1x device scale and don't
|
||||
// match Windows button sizes at hidpi.
|
||||
|
||||
|
@ -138,7 +139,6 @@ int WinCaptionButton::GetButtonDisplayOrderIndex() const {
|
|||
break;
|
||||
default:
|
||||
NOTREACHED();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Reverse the ordering if we're in RTL mode
|
||||
|
@ -207,7 +207,6 @@ void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
|
|||
|
||||
default:
|
||||
NOTREACHED();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,8 @@ class WinCaptionButton : public views::Button {
|
|||
WinCaptionButton& operator=(const WinCaptionButton&) = delete;
|
||||
|
||||
// // views::Button:
|
||||
gfx::Size CalculatePreferredSize() const override;
|
||||
gfx::Size CalculatePreferredSize(
|
||||
const views::SizeBounds& available_size) const override;
|
||||
void OnPaintBackground(gfx::Canvas* canvas) override;
|
||||
void PaintButtonContents(gfx::Canvas* canvas) override;
|
||||
|
||||
|
|
|
@ -217,7 +217,6 @@ void NotifyIconHost::Remove(NotifyIcon* icon) {
|
|||
|
||||
if (i == notify_icons_.end()) {
|
||||
NOTREACHED();
|
||||
return;
|
||||
}
|
||||
|
||||
mouse_entered_exited_detector_->IconRemoved(*i);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue