Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1259)

Unified Diff: content/renderer/render_view_impl.cc

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed flag Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/renderer_webcolorchooser_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1fb37fea9baff883ed2898798ee3116f45b4ec8e..10452805261b946424d1a052081c62879dbf73db 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -74,6 +74,9 @@
#include "content/renderer/renderer_accessibility.h"
#include "content/renderer/renderer_gpu_video_decoder_factories.h"
#include "content/renderer/renderer_webapplicationcachehost_impl.h"
+#if defined(ENABLE_INPUT_COLOR)
+#include "content/renderer/renderer_webcolorchooser_impl.h"
+#endif
#include "content/renderer/renderer_webstoragenamespace_impl.h"
#include "content/renderer/speech_input_dispatcher.h"
#include "content/renderer/text_input_client_observer.h"
@@ -369,6 +372,9 @@ RenderViewImpl::RenderViewImpl(
p2p_socket_dispatcher_(NULL),
devtools_agent_(NULL),
renderer_accessibility_(NULL),
+#if defined(ENABLE_INPUT_COLOR)
+ color_chooser_(NULL),
+#endif
session_storage_namespace_id_(session_storage_namespace_id),
handling_select_range_(false),
#if defined(OS_WIN)
@@ -1570,6 +1576,26 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() {
return did_execute_command;
}
+#if defined(ENABLE_INPUT_COLOR)
+WebKit::WebColorChooser* RenderViewImpl::createColorChooser(
+ WebKit::WebColorChooserClient* client,
+ const WebKit::WebColor& initial_color) {
+ if (color_chooser_) {
+ color_chooser_->endChooser();
+ }
+ color_chooser_ = new RendererWebColorChooserImpl(this, client);
+ ViewHostMsg_SetSelectedColorInColorChooser_Params ipc_params;
+ ipc_params.color = initial_color;
+ Send(new ViewHostMsg_OpenColorChooser(routing_id_, ipc_params));
+ return static_cast<WebKit::WebColorChooser*>(color_chooser_);
+}
+void RenderViewImpl::detachColorChooser(WebKit::WebColorChooser* session) {
+ if (session != color_chooser_)
+ return;
+ color_chooser_ = NULL;
+}
+#endif
+
bool RenderViewImpl::runFileChooser(
const WebKit::WebFileChooserParams& params,
WebFileChooserCompletion* chooser_completion) {
@@ -4065,6 +4091,10 @@ void RenderViewImpl::OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
void RenderViewImpl::OnShouldClose() {
bool should_close = webview()->dispatchBeforeUnloadEvent();
Send(new ViewHostMsg_ShouldClose_ACK(routing_id_, should_close));
+#if defined(ENABLE_INPUT_COLOR)
+ if (color_chooser_)
+ color_chooser_->endChooser();
+#endif
}
void RenderViewImpl::OnSwapOut(const ViewMsg_SwapOut_Params& params) {
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/renderer_webcolorchooser_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698