| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 8d5d6e5fa2c21753d05914b8b696e06ae7b9593b..8709b7c093de6abdffe0d388f55c23d5a263b686 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"
|
| @@ -368,6 +369,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)
|
| @@ -1569,6 +1571,24 @@ 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);
|
| + 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::endColorChooser(WebKit::WebColorChooser* session) {
|
| + if (session != color_chooser_)
|
| + return;
|
| + color_chooser_ = NULL;
|
| +}
|
| +
|
| bool RenderViewImpl::runFileChooser(
|
| const WebKit::WebFileChooserParams& params,
|
| WebFileChooserCompletion* chooser_completion) {
|
| @@ -4063,6 +4083,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) {
|
|
|