diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h')
| -rw-r--r-- | chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h index ed575daff9a..3b882a4dd2e 100644 --- a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h +++ b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h @@ -26,8 +26,8 @@ #ifndef ColorChooserPopupUIController_h #define ColorChooserPopupUIController_h -#include "ColorChooserUIController.h" #include "core/page/PagePopupClient.h" +#include "web/ColorChooserUIController.h" #include "wtf/OwnPtr.h" namespace WebCore { @@ -37,10 +37,12 @@ class PagePopup; namespace blink { -class ColorChooserPopupUIController : public ColorChooserUIController, public WebCore::PagePopupClient { +class ChromeClientImpl; + +class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public WebCore::PagePopupClient { public: - ColorChooserPopupUIController(ChromeClientImpl*, WebCore::ColorChooserClient*); + ColorChooserPopupUIController(WebCore::LocalFrame*, ChromeClientImpl*, WebCore::ColorChooserClient*); virtual ~ColorChooserPopupUIController(); // ColorChooserUIController functions: @@ -51,7 +53,7 @@ public: // PagePopupClient functions: virtual WebCore::IntSize contentSize() OVERRIDE; - virtual void writeDocument(WebCore::DocumentWriter&) OVERRIDE; + virtual void writeDocument(WebCore::SharedBuffer*) OVERRIDE; virtual WebCore::Locale& locale() OVERRIDE; virtual void setValueAndClosePopup(int, const String&) OVERRIDE; virtual void setValue(const String&) OVERRIDE; |