From f6665edc7329e76b5d5ea556124e9b2ad8045315 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 8 Apr 2018 21:47:23 +0530 Subject: [PATCH] Convert ColorChooser from ipc to mojo. https://chromium-review.googlesource.com/c/chromium/src/+/800350 https://chromium-review.googlesource.com/c/chromium/src/+/821954 --- atom/browser/common_web_contents_delegate.cc | 2 +- atom/browser/common_web_contents_delegate.h | 3 ++- brightray/browser/inspectable_web_contents_impl.cc | 2 +- brightray/browser/inspectable_web_contents_impl.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index 1c7ff9c4b3..7b80f8215e 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -231,7 +231,7 @@ bool CommonWebContentsDelegate::CanOverscrollContent() const { content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser( content::WebContents* web_contents, SkColor color, - const std::vector& suggestions) { + const std::vector& suggestions) { return chrome::ShowColorChooser(web_contents, color); } diff --git a/atom/browser/common_web_contents_delegate.h b/atom/browser/common_web_contents_delegate.h index 1321621246..1bcba0e9e7 100644 --- a/atom/browser/common_web_contents_delegate.h +++ b/atom/browser/common_web_contents_delegate.h @@ -72,7 +72,8 @@ class CommonWebContentsDelegate content::ColorChooser* OpenColorChooser( content::WebContents* web_contents, SkColor color, - const std::vector& suggestions) override; + const std::vector& suggestions) + override; void RunFileChooser(content::RenderFrameHost* render_frame_host, const content::FileChooserParams& params) override; void EnumerateDirectory(content::WebContents* web_contents, diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index c7b8e5427d..0b70159c62 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -731,7 +731,7 @@ void InspectableWebContentsImpl::CloseContents(content::WebContents* source) { content::ColorChooser* InspectableWebContentsImpl::OpenColorChooser( content::WebContents* source, SkColor color, - const std::vector& suggestions) { + const std::vector& suggestions) { auto* delegate = web_contents_->GetDelegate(); if (delegate) return delegate->OpenColorChooser(source, color, suggestions); diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index 1abd0846fd..9ebcbfdd1f 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -161,7 +161,8 @@ class InspectableWebContentsImpl content::ColorChooser* OpenColorChooser( content::WebContents* source, SkColor color, - const std::vector& suggestions) override; + const std::vector& suggestions) + override; void RunFileChooser(content::RenderFrameHost* render_frame_host, const content::FileChooserParams& params) override; void EnumerateDirectory(content::WebContents* source,