diff options
author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 13:14:03 +0000 |
---|---|---|
committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 13:14:03 +0000 |
commit | dd8678f89eba316c04d9f19495967f8e946ecdd3 (patch) | |
tree | fe6d21214584373e15f4f8e3a1b49e8addd13e2c /content/public/browser | |
parent | 89816d550c9cbb0cd91604b24f7df962d821b761 (diff) | |
download | chromium_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/public/browser')
-rw-r--r-- | content/public/browser/color_chooser.h | 47 | ||||
-rw-r--r-- | content/public/browser/web_contents.h | 8 | ||||
-rw-r--r-- | content/public/browser/web_contents_delegate.cc | 6 | ||||
-rw-r--r-- | content/public/browser/web_contents_delegate.h | 9 |
4 files changed, 0 insertions, 70 deletions
diff --git a/content/public/browser/color_chooser.h b/content/public/browser/color_chooser.h deleted file mode 100644 index 7519da5..0000000 --- a/content/public/browser/color_chooser.h +++ /dev/null @@ -1,47 +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_PUBLIC_BROWSER_COLOR_CHOOSER_H_ -#define CONTENT_PUBLIC_BROWSER_COLOR_CHOOSER_H_ -#pragma once - -#include "third_party/skia/include/core/SkColor.h" - -namespace content { - -class RenderViewHost; -class WebContents; - -// Abstraction object for color choosers for each platform. -class ColorChooser { - public: - static ColorChooser* Create(int identifier, - WebContents* tab, - SkColor initial_color); - ColorChooser(int identifier) : identifier_(identifier) {} - virtual ~ColorChooser() {} - - // Returns a unique identifier for this chooser. Identifiers are unique - // across a renderer process. This avoids race conditions in synchronizing - // the browser and renderer processes. For example, if a renderer closes one - // chooser and opens another, and simultaneously the user picks a color in the - // first chooser, the IDs can be used to drop the "chose a color" message - // rather than erroneously tell the renderer that the user picked a color in - // the second chooser. - int identifier() const { return identifier_; } - - // Ends connection with color chooser. Closes color chooser depending on the - // platform. - virtual void End() = 0; - - // Sets the selected color. - virtual void SetSelectedColor(SkColor color) = 0; - -private: - int identifier_; -}; - -} - -#endif // CONTENT_PUBLIC_BROWSER_COLOR_CHOOSER_H_ diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 80e4929..abd656a 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -15,7 +15,6 @@ #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_ui.h" #include "content/public/common/view_type.h" -#include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" @@ -357,13 +356,6 @@ class WebContents : public PageNavigator { // locked. virtual bool GotResponseToLockMouseRequest(bool allowed) = 0; - // Called when the user has selected a color in the color chooser. - virtual void DidChooseColorInColorChooser(int color_chooser_id, - const SkColor&) = 0; - - // Called when the color chooser has ended. - virtual void DidEndColorChooser(int color_chooser_id) = 0; - // Returns true if the location bar should be focused by default rather than // the page contents. The view calls this function when the tab is focused // to see what it should do. diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index 0e24df0..39f8448 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -134,12 +134,6 @@ bool WebContentsDelegate::IsFullscreenForTab(const WebContents* tab) const { return false; } -content::ColorChooser* WebContentsDelegate::OpenColorChooser(WebContents* tab, - int color_chooser_id, - const SkColor& color) { - return NULL; -} - void WebContentsDelegate::WebIntentDispatch( WebContents* tab, WebIntentsDispatcher* intents_dispatcher) { diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index 2d1669c..d5111fd 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -15,7 +15,6 @@ #include "content/public/browser/navigation_type.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/window_container_type.h" -#include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" @@ -30,7 +29,6 @@ class ListValue; namespace content { class BrowserContext; -class ColorChooser; class DownloadItem; class JavaScriptDialogCreator; class RenderViewHost; @@ -312,13 +310,6 @@ class CONTENT_EXPORT WebContentsDelegate { // NULL in which case dialogs aren't shown. virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator(); - // Called when color chooser should open. Returns the opened color chooser. - virtual content::ColorChooser* OpenColorChooser(WebContents* tab, - int color_chooser_id, - const SkColor& color); - - virtual void DidEndColorChooser() {} - // Called when a file selection is to be done. virtual void RunFileChooser(WebContents* tab, const FileChooserParams& params) {} |