Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 99088a83aeb280bf7d9eed915c23c0a478fca618..c500555c85f1c749b3c48b3ae91818fde5e18ba8 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -74,6 +74,7 @@ |
#include "content/renderer/renderer_accessibility.h" |
#include "content/renderer/renderer_gpu_video_decoder_factories.h" |
#include "content/renderer/renderer_webapplicationcachehost_impl.h" |
+#include "content/renderer/renderer_webcolorchooser_impl.h" |
#include "content/renderer/renderer_webstoragenamespace_impl.h" |
#include "content/renderer/speech_input_dispatcher.h" |
#include "content/renderer/text_input_client_observer.h" |
@@ -374,6 +375,7 @@ RenderViewImpl::RenderViewImpl( |
p2p_socket_dispatcher_(NULL), |
devtools_agent_(NULL), |
renderer_accessibility_(NULL), |
+ color_chooser_(NULL), |
session_storage_namespace_id_(session_storage_namespace_id), |
handling_select_range_(false), |
#if defined(OS_WIN) |
@@ -1608,6 +1610,20 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() { |
return did_execute_command; |
} |
+WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
+ WebKit::WebColorChooserClient* client, |
+ const WebKit::WebColor& initial_color) { |
+ if (color_chooser_) |
+ color_chooser_->endChooser(); |
+ color_chooser_ = new RendererWebColorChooserImpl(this, client); |
+ Send(new ViewHostMsg_OpenColorChooser(routing_id_, initial_color)); |
+ return static_cast<WebKit::WebColorChooser*>(color_chooser_); |
+} |
+ |
+void RenderViewImpl::endColorChooser() { |
jam
2012/01/27 18:13:40
I don't think this function is needed.
The colorc
keishi
2012/02/06 15:01:57
This pointer was used to end the ColorChooser insi
jam
2012/02/07 02:51:46
Perhaps I wasn't clear. I don't think this is need
|
+ color_chooser_ = NULL; |
+} |
+ |
bool RenderViewImpl::runFileChooser( |
const WebKit::WebFileChooserParams& params, |
WebFileChooserCompletion* chooser_completion) { |
@@ -4111,6 +4127,8 @@ void RenderViewImpl::OnGetSerializedHtmlDataForCurrentPageWithLocalLinks( |
void RenderViewImpl::OnShouldClose() { |
bool should_close = webview()->dispatchBeforeUnloadEvent(); |
Send(new ViewHostMsg_ShouldClose_ACK(routing_id_, should_close)); |
+ if (color_chooser_) |
+ color_chooser_->endChooser(); |
} |
void RenderViewImpl::OnSwapOut(const ViewMsg_SwapOut_Params& params) { |