Upstream version 10.39.225.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 d893677..ee9d531 100644 (file)
--- a/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
+++ b/src/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
@@ -31,43 +31,43 @@
 #include "wtf/OwnPtr.h"
 
 namespace blink {
-class ColorChooserClient;
-class PagePopup;
-}
-
-namespace blink {
 
 class ChromeClientImpl;
+class ColorChooserClient;
+class PagePopup;
 
-class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public blink::PagePopupClient  {
+class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public PagePopupClient  {
 
 public:
-    ColorChooserPopupUIController(blink::LocalFrame*, ChromeClientImpl*, blink::ColorChooserClient*);
+    ColorChooserPopupUIController(LocalFrame*, ChromeClientImpl*, ColorChooserClient*);
     virtual ~ColorChooserPopupUIController();
 
     // ColorChooserUIController functions:
     virtual void openUI() OVERRIDE;
 
     // ColorChooser functions
-    void endChooser() OVERRIDE;
+    virtual void endChooser() OVERRIDE;
+    virtual AXObject* rootAXObject() OVERRIDE;
 
     // PagePopupClient functions:
-    virtual blink::IntSize contentSize() OVERRIDE;
-    virtual void writeDocument(blink::SharedBuffer*) OVERRIDE;
-    virtual blink::Locale& locale() 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:
     void openPopup();
 
     ChromeClientImpl* m_chromeClient;
-    blink::ColorChooserClient* m_client;
-    blink::PagePopup* m_popup;
-    blink::Locale& m_locale;
+    ColorChooserClient* m_client;
+    PagePopup* m_popup;
+    Locale& m_locale;
 };
+
 }
 
 #endif // ColorChooserPopupUIController_h