BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 25 insertions, 20 deletions

diff --git a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
index 3b882a4dd2e..b0694b31787 100644
--- a/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
+++ b/chromium/third_party/WebKit/Source/web/ColorChooserPopupUIController.h
@@ -30,44 +30,49 @@
 #include "web/ColorChooserUIController.h"
 #include "wtf/OwnPtr.h"
 
-namespace WebCore {
-class ColorChooserClient;
-class PagePopup;
-}
-
 namespace blink {
 
 class ChromeClientImpl;
+class ColorChooserClient;
+class PagePopup;
 
-class ColorChooserPopupUIController FINAL : public ColorChooserUIController, public WebCore::PagePopupClient  {
+class ColorChooserPopupUIController final : public ColorChooserUIController, public PagePopupClient  {
 
 public:
-    ColorChooserPopupUIController(WebCore::LocalFrame*, ChromeClientImpl*, WebCore::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
-    void endChooser() OVERRIDE;
+    virtual void endChooser() override;
+    virtual AXObject* rootAXObject() override;
 
     // PagePopupClient functions:
-    virtual WebCore::IntSize contentSize() 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;
-    virtual void closePopup() 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;
-    WebCore::ColorChooserClient* m_client;
-    WebCore::PagePopup* m_popup;
-    WebCore::Locale& m_locale;
+    PagePopup* m_popup;
+    Locale& m_locale;
 };
-}
+
+} // namespace blink
 
 #endif // ColorChooserPopupUIController_h