Index: Source/web/ChromeClientImpl.h |
diff --git a/Source/web/ChromeClientImpl.h b/Source/web/ChromeClientImpl.h |
index d923b959b1435f5f1289c0a156b15438bead1173..e5047e14e4e000d432f0c79c1880b6b0607a5eae 100644 |
--- a/Source/web/ChromeClientImpl.h |
+++ b/Source/web/ChromeClientImpl.h |
@@ -56,18 +56,15 @@ class RenderBox; |
class SecurityOrigin; |
class DateTimeChooser; |
class DateTimeChooserClient; |
-struct WindowFeatures; |
-} |
- |
-namespace blink { |
class WebColorChooser; |
class WebColorChooserClient; |
class WebViewImpl; |
struct WebCursorInfo; |
struct WebPopupMenuInfo; |
+struct WindowFeatures; |
// Handles window-level notifications from WebCore on behalf of a WebView. |
-class ChromeClientImpl FINAL : public blink::ChromeClient { |
+class ChromeClientImpl FINAL : public ChromeClient { |
public: |
explicit ChromeClientImpl(WebViewImpl* webView); |
virtual ~ChromeClientImpl(); |
@@ -76,17 +73,17 @@ public: |
// ChromeClient methods: |
virtual void chromeDestroyed() OVERRIDE; |
- virtual void setWindowRect(const blink::FloatRect&) OVERRIDE; |
- virtual blink::FloatRect windowRect() OVERRIDE; |
- virtual blink::FloatRect pageRect() OVERRIDE; |
+ virtual void setWindowRect(const FloatRect&) OVERRIDE; |
+ virtual FloatRect windowRect() OVERRIDE; |
+ virtual FloatRect pageRect() OVERRIDE; |
virtual void focus() OVERRIDE; |
- virtual bool canTakeFocus(blink::FocusType) OVERRIDE; |
- virtual void takeFocus(blink::FocusType) OVERRIDE; |
- virtual void focusedNodeChanged(blink::Node*) OVERRIDE; |
- virtual void focusedFrameChanged(blink::LocalFrame*) OVERRIDE; |
- virtual blink::Page* createWindow( |
- blink::LocalFrame*, const blink::FrameLoadRequest&, const blink::WindowFeatures&, blink::NavigationPolicy, blink::ShouldSendReferrer) OVERRIDE; |
- virtual void show(blink::NavigationPolicy) OVERRIDE; |
+ virtual bool canTakeFocus(FocusType) OVERRIDE; |
+ virtual void takeFocus(FocusType) OVERRIDE; |
+ virtual void focusedNodeChanged(Node*) OVERRIDE; |
+ virtual void focusedFrameChanged(LocalFrame*) OVERRIDE; |
+ virtual Page* createWindow( |
+ LocalFrame*, const FrameLoadRequest&, const WindowFeatures&, NavigationPolicy, ShouldSendReferrer) OVERRIDE; |
+ virtual void show(NavigationPolicy) OVERRIDE; |
virtual bool canRunModal() OVERRIDE; |
virtual void runModal() OVERRIDE; |
virtual void setToolbarsVisible(bool) OVERRIDE; |
@@ -100,58 +97,58 @@ public: |
virtual void setResizable(bool) OVERRIDE; |
virtual bool shouldReportDetailedMessageForSource(const WTF::String&) OVERRIDE; |
virtual void addMessageToConsole( |
- blink::LocalFrame*, blink::MessageSource, blink::MessageLevel, |
+ LocalFrame*, MessageSource, MessageLevel, |
const WTF::String& message, unsigned lineNumber, |
const WTF::String& sourceID, const WTF::String& stackTrace) OVERRIDE; |
virtual bool canRunBeforeUnloadConfirmPanel() OVERRIDE; |
virtual bool runBeforeUnloadConfirmPanel( |
- const WTF::String& message, blink::LocalFrame*) OVERRIDE; |
+ const WTF::String& message, LocalFrame*) OVERRIDE; |
virtual void closeWindowSoon() OVERRIDE; |
- virtual void runJavaScriptAlert(blink::LocalFrame*, const WTF::String&) OVERRIDE; |
- virtual bool runJavaScriptConfirm(blink::LocalFrame*, const WTF::String&) OVERRIDE; |
+ virtual void runJavaScriptAlert(LocalFrame*, const WTF::String&) OVERRIDE; |
+ virtual bool runJavaScriptConfirm(LocalFrame*, const WTF::String&) OVERRIDE; |
virtual bool runJavaScriptPrompt( |
- blink::LocalFrame*, const WTF::String& message, |
+ LocalFrame*, const WTF::String& message, |
const WTF::String& defaultValue, WTF::String& result) OVERRIDE; |
virtual void setStatusbarText(const WTF::String& message) OVERRIDE; |
virtual bool tabsToLinks() OVERRIDE; |
- virtual blink::IntRect windowResizerRect() const OVERRIDE; |
- virtual void invalidateContentsAndRootView(const blink::IntRect&) OVERRIDE; |
- virtual void invalidateContentsForSlowScroll(const blink::IntRect&) OVERRIDE; |
+ virtual IntRect windowResizerRect() const OVERRIDE; |
+ virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE; |
+ virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE; |
virtual void scheduleAnimation() OVERRIDE; |
virtual void scroll() OVERRIDE; |
- virtual blink::IntRect rootViewToScreen(const blink::IntRect&) const OVERRIDE; |
+ virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE; |
virtual WebScreenInfo screenInfo() const OVERRIDE; |
- virtual void contentsSizeChanged(blink::LocalFrame*, const blink::IntSize&) const OVERRIDE; |
+ virtual void contentsSizeChanged(LocalFrame*, const IntSize&) const OVERRIDE; |
virtual void deviceOrPageScaleFactorChanged() const OVERRIDE; |
- virtual void layoutUpdated(blink::LocalFrame*) const OVERRIDE; |
+ virtual void layoutUpdated(LocalFrame*) const OVERRIDE; |
virtual void mouseDidMoveOverElement( |
- const blink::HitTestResult&, unsigned modifierFlags) OVERRIDE; |
- virtual void setToolTip(const WTF::String& tooltipText, blink::TextDirection) OVERRIDE; |
- virtual void dispatchViewportPropertiesDidChange(const blink::ViewportDescription&) const OVERRIDE; |
- virtual void print(blink::LocalFrame*) OVERRIDE; |
+ const HitTestResult&, unsigned modifierFlags) OVERRIDE; |
+ virtual void setToolTip(const WTF::String& tooltipText, TextDirection) OVERRIDE; |
+ virtual void dispatchViewportPropertiesDidChange(const ViewportDescription&) const OVERRIDE; |
+ virtual void print(LocalFrame*) OVERRIDE; |
virtual void annotatedRegionsChanged() OVERRIDE; |
- virtual bool paintCustomOverhangArea(blink::GraphicsContext*, const blink::IntRect&, const blink::IntRect&, const blink::IntRect&) OVERRIDE; |
- virtual PassOwnPtr<blink::ColorChooser> createColorChooser(blink::LocalFrame*, blink::ColorChooserClient*, const blink::Color&) OVERRIDE; |
- virtual PassRefPtrWillBeRawPtr<blink::DateTimeChooser> openDateTimeChooser(blink::DateTimeChooserClient*, const blink::DateTimeChooserParameters&) OVERRIDE; |
- virtual void openTextDataListChooser(blink::HTMLInputElement&) OVERRIDE; |
- virtual void runOpenPanel(blink::LocalFrame*, PassRefPtr<blink::FileChooser>) OVERRIDE; |
- virtual void enumerateChosenDirectory(blink::FileChooser*) OVERRIDE; |
- virtual void setCursor(const blink::Cursor&) OVERRIDE; |
+ virtual bool paintCustomOverhangArea(GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) OVERRIDE; |
+ virtual PassOwnPtr<ColorChooser> createColorChooser(LocalFrame*, ColorChooserClient*, const Color&) OVERRIDE; |
+ virtual PassRefPtrWillBeRawPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) OVERRIDE; |
+ virtual void openTextDataListChooser(HTMLInputElement&) OVERRIDE; |
+ virtual void runOpenPanel(LocalFrame*, PassRefPtr<FileChooser>) OVERRIDE; |
+ virtual void enumerateChosenDirectory(FileChooser*) OVERRIDE; |
+ virtual void setCursor(const Cursor&) OVERRIDE; |
virtual void needTouchEvents(bool needTouchEvents) OVERRIDE; |
- virtual void setTouchAction(blink::TouchAction) OVERRIDE; |
+ virtual void setTouchAction(TouchAction) OVERRIDE; |
- virtual blink::GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE; |
+ virtual GraphicsLayerFactory* graphicsLayerFactory() const OVERRIDE; |
// Pass 0 as the GraphicsLayer to detatch the root layer. |
- virtual void attachRootGraphicsLayer(blink::GraphicsLayer*) OVERRIDE; |
+ virtual void attachRootGraphicsLayer(GraphicsLayer*) OVERRIDE; |
- virtual void enterFullScreenForElement(blink::Element*) OVERRIDE; |
- virtual void exitFullScreenForElement(blink::Element*) OVERRIDE; |
+ virtual void enterFullScreenForElement(Element*) OVERRIDE; |
+ virtual void exitFullScreenForElement(Element*) OVERRIDE; |
virtual void clearCompositedSelectionBounds() OVERRIDE; |
// ChromeClient methods: |
- virtual void postAccessibilityNotification(blink::AXObject*, blink::AXObjectCache::AXNotification) OVERRIDE; |
+ virtual void postAccessibilityNotification(AXObject*, AXObjectCache::AXNotification) OVERRIDE; |
virtual String acceptLanguages() OVERRIDE; |
// ChromeClientImpl: |
@@ -159,25 +156,25 @@ public: |
void setNewWindowNavigationPolicy(WebNavigationPolicy); |
virtual bool hasOpenedPopup() const OVERRIDE; |
- virtual PassRefPtr<blink::PopupMenu> createPopupMenu(blink::LocalFrame&, blink::PopupMenuClient*) const OVERRIDE; |
- blink::PagePopup* openPagePopup(blink::PagePopupClient*, const blink::IntRect&); |
- void closePagePopup(blink::PagePopup*); |
- virtual void setPagePopupDriver(blink::PagePopupDriver*) OVERRIDE; |
+ virtual PassRefPtr<PopupMenu> createPopupMenu(LocalFrame&, PopupMenuClient*) const OVERRIDE; |
+ PagePopup* openPagePopup(PagePopupClient*, const IntRect&); |
+ void closePagePopup(PagePopup*); |
+ virtual void setPagePopupDriver(PagePopupDriver*) OVERRIDE; |
virtual void resetPagePopupDriver() OVERRIDE; |
- virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, blink::Document::PageDismissalType) const OVERRIDE; |
+ virtual bool shouldRunModalDialogDuringPageDismissal(const DialogType&, const String& dialogMessage, Document::PageDismissalType) const OVERRIDE; |
virtual bool requestPointerLock() OVERRIDE; |
virtual void requestPointerUnlock() OVERRIDE; |
- virtual void didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<blink::Element> >&) OVERRIDE; |
- virtual void didChangeValueInTextField(blink::HTMLFormControlElement&) OVERRIDE; |
- virtual void didEndEditingOnTextField(blink::HTMLInputElement&) OVERRIDE; |
- virtual void handleKeyboardEventOnTextField(blink::HTMLInputElement&, blink::KeyboardEvent&) OVERRIDE; |
+ virtual void didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element> >&) OVERRIDE; |
+ virtual void didChangeValueInTextField(HTMLFormControlElement&) OVERRIDE; |
+ virtual void didEndEditingOnTextField(HTMLInputElement&) OVERRIDE; |
+ virtual void handleKeyboardEventOnTextField(HTMLInputElement&, KeyboardEvent&) OVERRIDE; |
// FIXME: Remove this method once we have input routing in the browser |
// process. See http://crbug.com/339659. |
- virtual void forwardInputEvent(blink::Frame*, blink::Event*) OVERRIDE; |
+ virtual void forwardInputEvent(Frame*, Event*) OVERRIDE; |
virtual void didCancelCompositionOnSelectionChange() OVERRIDE; |
virtual void willSetInputMethodState() OVERRIDE; |
@@ -197,10 +194,10 @@ private: |
bool m_menubarVisible; |
bool m_resizable; |
- blink::PagePopupDriver* m_pagePopupDriver; |
+ PagePopupDriver* m_pagePopupDriver; |
}; |
-DEFINE_TYPE_CASTS(ChromeClientImpl, blink::ChromeClient, client, client->isChromeClientImpl(), client.isChromeClientImpl()); |
+DEFINE_TYPE_CASTS(ChromeClientImpl, ChromeClient, client, client->isChromeClientImpl(), client.isChromeClientImpl()); |
} // namespace blink |