Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / ColorChooserPopupUIController.h

diff --git a/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
index ee9d531..b0694b3 100644 (file)
--- a/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
+++ b/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
@@ -36,38 +36,43 @@ class ChromeClientImpl;
 class ColorChooserClient;
 class PagePopup;
 
-class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public PagePopupClient  {
+class ColorChooserPopupUIController final : public ColorChooserUIController, public PagePopupClient  {
 
 public:
-    ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
+    static PassOwnPtrWillBeRawPtr<ColorChooserPopupUIController> create(LocalFrame* frame, ChromeClientImpl* chromeClient, ColorChooserClient* client)
+    {
+        return adoptPtrWillBeNoop(new ColorChooserPopupUIController(frame, chromeClient, client));
+    }
+
     virtual ~ColorChooserPopupUIController();
 
     // ColorChooserUIController functions:
-    virtual void openUI() OVERRIDE;
+    virtual void openUI() override;
 
     // ColorChooser functions
-    virtual void endChooser() OVERRIDE;
-    virtual AXObject* rootAXObject() OVERRIDE;
+    virtual void endChooser() override;
+    virtual AXObject* rootAXObject() override;
 
     // PagePopupClient functions:
-    virtual IntSize contentSize() OVERRIDE;
-    virtual void writeDocument(SharedBuffer*) OVERRIDE;
-    virtual Locale& locale() OVERRIDE;
-    virtual void setValueAndClosePopup(int, const String&) OVERRIDE;
-    virtual void setValue(const String&) OVERRIDE;
-    virtual void closePopup() OVERRIDE;
-    virtual Element& ownerElement() OVERRIDE;
-    virtual void didClosePopup() OVERRIDE;
+    virtual IntSize contentSize() override;
+    virtual void writeDocument(SharedBuffer*) override;
+    virtual Locale& locale() override;
+    virtual void setValueAndClosePopup(int, const String&) override;
+    virtual void setValue(const String&) override;
+    virtual void closePopup() override;
+    virtual Element& ownerElement() override;
+    virtual void didClosePopup() override;
 
 private:
+    ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
+
     void openPopup();
 
     ChromeClientImpl* m_chromeClient;
-    ColorChooserClient* m_client;
     PagePopup* m_popup;
     Locale& m_locale;
 };
 
-}
+} // namespace blink
 
 #endif // ColorChooserPopupUIController_h