| Index: Source/web/ColorChooserPopupUIController.h
|
| diff --git a/Source/web/ColorChooserPopupUIController.h b/Source/web/ColorChooserPopupUIController.h
|
| index d8936770b447ac6cc42f03cc87cbd5c94b17aa97..5a20e07a34ec3280a7ca0cfdebeaa924596974d9 100644
|
| --- a/Source/web/ColorChooserPopupUIController.h
|
| +++ b/Source/web/ColorChooserPopupUIController.h
|
| @@ -31,18 +31,15 @@
|
| #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:
|
| @@ -52,9 +49,9 @@ public:
|
| void endChooser() 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;
|
| @@ -64,10 +61,11 @@ 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
|
|
|