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

Convert ColorChooser from ipc to mojo.

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/800350
https://chromium-review.googlesource.com/c/chromium/src/+/821954
This commit is contained in:
deepak1556 2018-04-08 21:47:23 +05:30 • committed by Samuel Attard
parent c29f08c53e
commit f6665edc73
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/common_web_contents_delegate.cc
View file

@ -231,7 +231,7 @@ bool CommonWebContentsDelegate::CanOverscrollContent() const {
content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser( content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser(
content::WebContents* web_contents, content::WebContents* web_contents,
SkColor color, SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) { const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {
return chrome::ShowColorChooser(web_contents, color); return chrome::ShowColorChooser(web_contents, color);
} }

3
atom/browser/common_web_contents_delegate.h
View file

@ -72,7 +72,8 @@ class CommonWebContentsDelegate
content::ColorChooser* OpenColorChooser( content::ColorChooser* OpenColorChooser(
content::WebContents* web_contents, content::WebContents* web_contents,
SkColor color, SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) override; const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
override;
void RunFileChooser(content::RenderFrameHost* render_frame_host, void RunFileChooser(content::RenderFrameHost* render_frame_host,
const content::FileChooserParams& params) override; const content::FileChooserParams& params) override;
void EnumerateDirectory(content::WebContents* web_contents, void EnumerateDirectory(content::WebContents* web_contents,

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -731,7 +731,7 @@ void InspectableWebContentsImpl::CloseContents(content::WebContents* source) {
content::ColorChooser* InspectableWebContentsImpl::OpenColorChooser( content::ColorChooser* InspectableWebContentsImpl::OpenColorChooser(
content::WebContents* source, content::WebContents* source,
SkColor color, SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) { const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions) {
auto* delegate = web_contents_->GetDelegate(); auto* delegate = web_contents_->GetDelegate();
if (delegate) if (delegate)
return delegate->OpenColorChooser(source, color, suggestions); return delegate->OpenColorChooser(source, color, suggestions);

3
brightray/browser/inspectable_web_contents_impl.h
View file

@ -161,7 +161,8 @@ class InspectableWebContentsImpl
content::ColorChooser* OpenColorChooser( content::ColorChooser* OpenColorChooser(
content::WebContents* source, content::WebContents* source,
SkColor color, SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) override; const std::vector<blink::mojom::ColorSuggestionPtr>& suggestions)
override;
void RunFileChooser(content::RenderFrameHost* render_frame_host, void RunFileChooser(content::RenderFrameHost* render_frame_host,
const content::FileChooserParams& params) override; const content::FileChooserParams& params) override;
void EnumerateDirectory(content::WebContents* source, void EnumerateDirectory(content::WebContents* source,