github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: mlaurencin <mlaurencin@electronjs.org>
This commit is contained in:
trop[bot]
2021-01-21 16:19:07 -08:00
committed by GitHub
parent 6122f4bece
commit f730284113
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
#include "base/values.h"
#include "chrome/browser/browser_process.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 "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
@@ -3164,6 +3165,12 @@ content::ColorChooser* WebContents::OpenColorChooser(
#endif
}
std::unique_ptr<content::EyeDropper> WebContents::OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) {
return ShowEyeDropper(frame, listener);
}
void WebContents::RunFileChooser(
content::RenderFrameHost* render_frame_host,
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,
const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
override;
std::unique_ptr<content::EyeDropper> OpenEyeDropper(
content::RenderFrameHost* frame,
content::EyeDropperListener* listener) override;
void RunFileChooser(content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params) override;