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

Unified Diff: content/renderer/render_view_impl.h

Issue 7685006: Implement input type=color UI (common part) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: forgot to turn off flag Created 9 years, 1 month 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
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 54dbb1b97222cbbace0f21e075f105881257c9dd..9add59bed675282c38f1de2a1d4a650768275705 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -69,6 +69,9 @@ class PepperDeviceTest;
class PrintWebViewHelper;
class RenderWidgetFullscreenPepper;
class RendererAccessibility;
+#if defined(ENABLE_INPUT_COLOR)
+class RendererWebColorChooserImpl;
+#endif // defined(ENABLE_INPUT_COLOR)
class SkBitmap;
class SpeechInputDispatcher;
class WebPluginDelegateProxy;
@@ -349,6 +352,9 @@ class RenderViewImpl : public RenderWidget,
virtual void didChangeSelection(bool is_selection_empty);
virtual void didExecuteCommand(const WebKit::WebString& command_name);
virtual bool handleCurrentKeyboardEvent();
+#if defined(ENABLE_INPUT_COLOR)
+ virtual WebKit::WebColorChooser* colorChooser();
+#endif // defined(ENABLE_INPUT_COLOR)
virtual bool runFileChooser(
const WebKit::WebFileChooserParams& params,
WebKit::WebFileChooserCompletion* chooser_completion);
@@ -795,6 +801,10 @@ class RenderViewImpl : public RenderWidget,
void OnEnablePreferredSizeChangedMode(int flags);
void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths);
void OnExecuteEditCommand(const std::string& name, const std::string& value);
+#if defined(ENABLE_INPUT_COLOR)
+ void OnDidChooseColorResponse(WebKit::WebColor color);
+ void OnDidCleanupColorChooser();
+#endif // defined(ENABLE_INPUT_COLOR)
void OnFileChooserResponse(const std::vector<FilePath>& paths);
void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&);
void OnFindReplyAck();
@@ -1166,6 +1176,10 @@ class RenderViewImpl : public RenderWidget,
// Misc ----------------------------------------------------------------------
+#if defined(ENABLE_INPUT_COLOR)
+ scoped_ptr<RendererWebColorChooserImpl> color_chooser_;
+#endif
+
// The current and pending file chooser completion objects. If the queue is
// nonempty, the first item represents the currently running file chooser
// callback, and the remaining elements are the other file chooser completion

Powered by Google App Engine
This is Rietveld 408576698