mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 94.0.4584.0 (main) (#30030)

Browse source 
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: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2021-07-26 09:02:16 -07:00 • committed by GitHub
parent a6ab702ae4
commit 64ba8feb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 531 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/ui/cocoa/window_buttons_view.mm
View file

@ -4,9 +4,9 @@
#include "shell/browser/ui/cocoa/window_buttons_view.h"
#include "base/cxx17_backports.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "ui/gfx/mac/coordinate_conversion.h"
namespace {

16
shell/browser/ui/inspectable_web_contents.cc
View file

@ -27,7 +27,6 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/file_select_listener.h"
#include "content/public/browser/file_url_loader.h"
#include "content/public/browser/host_zoom_map.h"
@ -908,8 +907,9 @@ void InspectableWebContents::HandleMessageFromDevToolsFrontend(
params = &empty_params;
}
int id = message.FindIntKey(kFrontendHostId).value_or(0);
base::ListValue* params_list = nullptr;
params->GetAsList(&params_list);
std::vector<base::Value> params_list;
if (params)
params_list = std::move(*params).TakeList();
embedder_message_dispatcher_->Dispatch(
base::BindRepeating(&InspectableWebContents::SendMessageAck,
weak_factory_.GetWeakPtr(), id),
@ -997,16 +997,6 @@ void InspectableWebContents::CloseContents(content::WebContents* source) {
CloseDevTools();
}
std::unique_ptr<content::ColorChooser> InspectableWebContents::OpenColorChooser(
content::WebContents* source,
SkColor color,
const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {
auto* delegate = web_contents_->GetDelegate();
if (delegate)
return delegate->OpenColorChooser(source, color, suggestions);
return nullptr;
}
void InspectableWebContents::RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,

5
shell/browser/ui/inspectable_web_contents.h
View file

@ -183,11 +183,6 @@ class InspectableWebContents
bool HandleKeyboardEvent(content::WebContents*,
const content::NativeWebKeyboardEvent&) override;
void CloseContents(content::WebContents* source) override;
std::unique_ptr<content::ColorChooser> OpenColorChooser(
content::WebContents* source,
SkColor color,
const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
override;
void RunFileChooser(content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params) override;

8
shell/browser/ui/views/menu_delegate.cc
View file

@ -74,8 +74,12 @@ std::u16string MenuDelegate::GetLabel(int id) const {
return adapter_->GetLabel(id);
}
void MenuDelegate::GetLabelStyle(int id, LabelStyle* style) const {
return adapter_->GetLabelStyle(id, style);
const gfx::FontList* MenuDelegate::GetLabelFontList(int id) const {
return adapter_->GetLabelFontList(id);
}
absl::optional<SkColor> MenuDelegate::GetLabelColor(int id) const {
return adapter_->GetLabelColor(id);
}
bool MenuDelegate::IsCommandEnabled(int id) const {

3
shell/browser/ui/views/menu_delegate.h
View file

@ -47,7 +47,8 @@ class MenuDelegate : public views::MenuDelegate {
const ui::Event& e) override;
bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
std::u16string GetLabel(int id) const override;
void GetLabelStyle(int id, LabelStyle* style) const override;
const gfx::FontList* GetLabelFontList(int id) const override;
absl::optional<SkColor> GetLabelColor(int id) const override;
bool IsCommandEnabled(int id) const override;
bool IsCommandVisible(int id) const override;
bool IsItemChecked(int id) const override;

2
shell/browser/ui/win/jump_list.cc
View file

@ -6,8 +6,8 @@
#include <propkey.h> // for PKEY_* constants
#include "base/cxx17_backports.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/win/scoped_co_mem.h"
#include "base/win/scoped_propvariant.h"
#include "base/win/win_util.h"