From 90f41dbd217fd7cb6b7bc85a035240ce6616881b Mon Sep 17 00:00:00 2001 From: "lazyboy@chromium.org" Date: Wed, 2 Apr 2014 06:32:41 +0000 Subject: [PATCH] Bring up color picker for BUG=358734 Test=Open chrome apps with pointing to a page that has , see it working (checked linux aura and mac). Review URL: https://codereview.chromium.org/219193014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261082 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_plugin/browser_plugin_guest.cc | 10 ++++++++++ content/browser/browser_plugin/browser_plugin_guest.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 32174857352f..61e93bd85807 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -794,6 +794,16 @@ JavaScriptDialogManager* BrowserPluginGuest::GetJavaScriptDialogManager() { return this; } +ColorChooser* BrowserPluginGuest::OpenColorChooser( + WebContents* web_contents, + SkColor color, + const std::vector& suggestions) { + if (!embedder_web_contents_ || !embedder_web_contents_->GetDelegate()) + return NULL; + return embedder_web_contents_->GetDelegate()->OpenColorChooser( + web_contents, color, suggestions); +} + bool BrowserPluginGuest::HandleContextMenu(const ContextMenuParams& params) { // TODO(fsamuel): We show the regular page context menu handler for now until // we implement the Apps Context Menu API for Browser Plugin (see diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index e55845ff67d7..263732971291 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -204,6 +204,10 @@ class CONTENT_EXPORT BrowserPluginGuest double progress) OVERRIDE; virtual void CloseContents(WebContents* source) OVERRIDE; virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE; + virtual ColorChooser* OpenColorChooser( + WebContents* web_contents, + SkColor color, + const std::vector& suggestions) OVERRIDE; virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; virtual void HandleKeyboardEvent( WebContents* source, -- 2.11.4.GIT