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;