summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 13:14:03 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 13:14:03 +0000
commitdd8678f89eba316c04d9f19495967f8e946ecdd3 (patch)
treefe6d21214584373e15f4f8e3a1b49e8addd13e2c /content/renderer
parent89816d550c9cbb0cd91604b24f7df962d821b761 (diff)
downloadchromium_src-dd8678f89eba316c04d9f19495967f8e946ecdd3.zip
chromium_src-dd8678f89eba316c04d9f19495967f8e946ecdd3.tar.gz
chromium_src-dd8678f89eba316c04d9f19495967f8e946ecdd3.tar.bz2
Revert 126889 - Implement input type=color UI
BUG=92608 TEST= Review URL: http://codereview.chromium.org/9203001 TBR=keishi@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/render_view_impl.cc10
-rw-r--r--content/renderer/render_view_impl.h3
-rw-r--r--content/renderer/renderer_webcolorchooser_impl.cc70
-rw-r--r--content/renderer/renderer_webcolorchooser_impl.h50
4 files changed, 0 insertions, 133 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 52caa04..b1bb198 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -81,7 +81,6 @@
#include "content/renderer/render_widget_fullscreen_pepper.h"
#include "content/renderer/renderer_accessibility.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/text_input_client_observer.h"
#include "content/renderer/v8_value_converter_impl.h"
@@ -1742,15 +1741,6 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() {
return did_execute_command;
}
-WebKit::WebColorChooser* RenderViewImpl::createColorChooser(
- WebKit::WebColorChooserClient* client,
- const WebKit::WebColor& initial_color) {
- RendererWebColorChooserImpl* color_chooser =
- new RendererWebColorChooserImpl(this, client);
- color_chooser->Open(static_cast<SkColor>(initial_color));
- return color_chooser;
-}
-
bool RenderViewImpl::runFileChooser(
const WebKit::WebFileChooserParams& params,
WebFileChooserCompletion* chooser_completion) {
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index f523434..a104ebe 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -75,7 +75,6 @@ class PepperDeviceTest;
struct PP_NetAddress_Private;
class RenderWidgetFullscreenPepper;
class RendererAccessibility;
-class RendererWebColorChooserImpl;
class SkBitmap;
class InputTagSpeechDispatcher;
struct ViewMsg_Navigate_Params;
@@ -377,8 +376,6 @@ class RenderViewImpl : public RenderWidget,
virtual void didChangeSelection(bool is_selection_empty);
virtual void didExecuteCommand(const WebKit::WebString& command_name);
virtual bool handleCurrentKeyboardEvent();
- virtual WebKit::WebColorChooser* createColorChooser(
- WebKit::WebColorChooserClient*, const WebKit::WebColor& initial_color);
virtual bool runFileChooser(
const WebKit::WebFileChooserParams& params,
WebKit::WebFileChooserCompletion* chooser_completion);
diff --git a/content/renderer/renderer_webcolorchooser_impl.cc b/content/renderer/renderer_webcolorchooser_impl.cc
deleted file mode 100644
index 9a50b19..0000000
--- a/content/renderer/renderer_webcolorchooser_impl.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/renderer/renderer_webcolorchooser_impl.h"
-
-#include "content/common/view_messages.h"
-#include "content/renderer/render_view_impl.h"
-
-static int GenerateColorChooserIdentifier() {
- static int next = 0;
- return ++next;
-}
-
-RendererWebColorChooserImpl::RendererWebColorChooserImpl(
- RenderViewImpl* render_view,
- WebKit::WebColorChooserClient* client)
- : content::RenderViewObserver(render_view),
- identifier_(GenerateColorChooserIdentifier()),
- client_(client) {
-}
-
-RendererWebColorChooserImpl::~RendererWebColorChooserImpl() {
-}
-
-bool RendererWebColorChooserImpl::OnMessageReceived(
- const IPC::Message& message) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(RendererWebColorChooserImpl, message)
- IPC_MESSAGE_HANDLER(ViewMsg_DidChooseColorResponse,
- OnDidChooseColorResponse)
- IPC_MESSAGE_HANDLER(ViewMsg_DidEndColorChooser,
- OnDidEndColorChooser)
- IPC_MESSAGE_UNHANDLED(handled = false)
- IPC_END_MESSAGE_MAP()
- return handled;
-}
-
-void RendererWebColorChooserImpl::FrameWillClose(WebKit::WebFrame* frame) {
- endChooser();
- client_->didEndChooser();
-}
-
-void RendererWebColorChooserImpl::setSelectedColor(WebKit::WebColor color) {
- Send(new ViewHostMsg_SetSelectedColorInColorChooser(routing_id(), identifier_,
- static_cast<SkColor>(color)));
-}
-
-void RendererWebColorChooserImpl::endChooser() {
- Send(new ViewHostMsg_EndColorChooser(routing_id(), identifier_));
-}
-
-void RendererWebColorChooserImpl::Open(SkColor initial_color) {
- Send(new ViewHostMsg_OpenColorChooser(routing_id(), identifier_,
- initial_color));
-}
-
-void RendererWebColorChooserImpl::OnDidChooseColorResponse(
- int color_chooser_id,
- const SkColor& color) {
- DCHECK(identifier_ == color_chooser_id);
-
- client_->didChooseColor(static_cast<WebKit::WebColor>(color));
-}
-
-void RendererWebColorChooserImpl::OnDidEndColorChooser(int color_chooser_id) {
- if (identifier_ != color_chooser_id)
- return;
- client_->didEndChooser();
-}
diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h
deleted file mode 100644
index afe0871..0000000
--- a/content/renderer/renderer_webcolorchooser_impl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_
-#pragma once
-
-#include "base/memory/scoped_ptr.h"
-#include "content/public/renderer/render_view_observer.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooser.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooserClient.h"
-#include "third_party/skia/include/core/SkColor.h"
-
-namespace WebKit {
-class WebFrame;
-}
-
-class RenderViewImpl;
-
-class RendererWebColorChooserImpl : public WebKit::WebColorChooser,
- public content::RenderViewObserver {
- public:
- explicit RendererWebColorChooserImpl(RenderViewImpl* sender,
- WebKit::WebColorChooserClient*);
- virtual ~RendererWebColorChooserImpl();
-
- virtual void setSelectedColor(const WebKit::WebColor);
- virtual void endChooser();
-
- void Open(SkColor initial_color);
-
- WebKit::WebColorChooserClient* client() { return client_; }
-
- private:
- // RenderViewObserver implementation.
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE;
-
- void OnDidChooseColorResponse(int color_chooser_id,
- const SkColor& color);
- void OnDidEndColorChooser(int color_chooser_id);
-
- int identifier_;
- WebKit::WebColorChooserClient* client_;
-
- DISALLOW_COPY_AND_ASSIGN(RendererWebColorChooserImpl);
-};
-
-#endif // CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_