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

fix: add eyedropper tool functionality to browser view (#27275)

Browse source
This commit is contained in:
Michaela Laurencin 2021-01-21 13:02:29 -08:00 • committed by GitHub
parent 96e8620e1b
commit 4f930b6e42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
chromium_src/BUILD.gn
View file

@ -145,10 +145,17 @@ static_library("chrome") {
"//chrome/browser/platform_util.h", "//chrome/browser/platform_util.h",
"//chrome/browser/ui/browser_dialogs.h", "//chrome/browser/ui/browser_dialogs.h",
"//chrome/browser/ui/color_chooser.h", "//chrome/browser/ui/color_chooser.h",
"//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
"//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
] ]
if (use_aura) { if (use_aura) {
sources += [ "//chrome/browser/platform_util_aura.cc" ] sources += [
"//chrome/browser/platform_util_aura.cc",
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
]
if (!is_win) { if (!is_win) {
sources += [ sources += [
@ -165,6 +172,8 @@ static_library("chrome") {
"//chrome/browser/media/webrtc/window_icon_util_mac.mm", "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
"//chrome/browser/ui/cocoa/color_chooser_mac.h", "//chrome/browser/ui/cocoa/color_chooser_mac.h",
"//chrome/browser/ui/cocoa/color_chooser_mac.mm", "//chrome/browser/ui/cocoa/color_chooser_mac.mm",
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
] ]
deps += [ deps += [
"//components/remote_cocoa/app_shim", "//components/remote_cocoa/app_shim",

7
shell/browser/api/electron_api_web_contents.cc
View file

@ -28,6 +28,7 @@
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/ssl/security_state_tab_helper.h" #include "chrome/browser/ssl/security_state_tab_helper.h"
#include "chrome/browser/ui/views/eye_dropper/eye_dropper.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h" #include "components/prefs/scoped_user_pref_update.h"
@ -3171,6 +3172,12 @@ content::ColorChooser* WebContents::OpenColorChooser(
#endif #endif
} }
std::unique_ptr<content::EyeDropper> WebContents::OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) {
return ShowEyeDropper(frame, listener);
}
void WebContents::RunFileChooser( void WebContents::RunFileChooser(
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener, scoped_refptr<content::FileSelectListener> listener,

3
shell/browser/api/electron_api_web_contents.h
View file

@ -636,6 +636,9 @@ class WebContents : public gin::Wrappable<WebContents>,
SkColor color, SkColor color,
const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
override; override;
std::unique_ptr<content::EyeDropper> OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) override;
void RunFileChooser(content::RenderFrameHost* render_frame_host, void RunFileChooser(content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener, scoped_refptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params) override; const blink::mojom::FileChooserParams& params) override;