Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2224)

Unified Diff: Source/web/ChromeClientImpl.h

Issue 1162953002: Cleanup: Move PopupOpeningObserver ownership from ChromeClient to ChromeClientImpl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/ChromeClientImpl.h
diff --git a/Source/web/ChromeClientImpl.h b/Source/web/ChromeClientImpl.h
index b6083ab3324364c016802625a734cf9ce1436b05..6fa817ddba8ff5e072b042b66681017970883314 100644
--- a/Source/web/ChromeClientImpl.h
+++ b/Source/web/ChromeClientImpl.h
@@ -120,9 +120,9 @@ public:
virtual void dispatchViewportPropertiesDidChange(const ViewportDescription&) const override;
virtual void printInternal(LocalFrame*) override;
virtual void annotatedRegionsChanged() override;
- virtual PassOwnPtrWillBeRawPtr<ColorChooser> createColorChooserInternal(LocalFrame*, ColorChooserClient*, const Color&) override;
- virtual PassRefPtr<DateTimeChooser> openDateTimeChooserInternal(DateTimeChooserClient*, const DateTimeChooserParameters&) override;
- virtual void runOpenPanelInternal(LocalFrame*, PassRefPtr<FileChooser>) override;
+ virtual PassOwnPtrWillBeRawPtr<ColorChooser> createColorChooser(LocalFrame*, ColorChooserClient*, const Color&) override;
+ virtual PassRefPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) override;
+ virtual void runOpenPanel(LocalFrame*, PassRefPtr<FileChooser>) override;
virtual void enumerateChosenDirectory(FileChooser*) override;
virtual void setCursorInternal(const Cursor&) override;
virtual void needTouchEvents(bool needTouchEvents) override;
@@ -151,7 +151,7 @@ public:
void setNewWindowNavigationPolicy(WebNavigationPolicy);
virtual bool hasOpenedPopup() const override;
- virtual PassRefPtrWillBeRawPtr<PopupMenu> createPopupMenuInternal(LocalFrame&, PopupMenuClient*) override;
+ virtual PassRefPtrWillBeRawPtr<PopupMenu> createPopupMenu(LocalFrame&, PopupMenuClient*) override;
PagePopup* openPagePopup(PagePopupClient*);
void closePagePopup(PagePopup*);
virtual DOMWindow* pagePopupWindowForTesting() const override;
@@ -166,7 +166,7 @@ public:
virtual void handleKeyboardEventOnTextField(HTMLInputElement&, KeyboardEvent&) override;
virtual void didChangeValueInTextField(HTMLFormControlElement&) override;
virtual void didEndEditingOnTextField(HTMLInputElement&) override;
- virtual void openTextDataListChooserInternal(HTMLInputElement&) override;
+ virtual void openTextDataListChooser(HTMLInputElement&) override;
virtual void textFieldDataListChanged(HTMLInputElement&) override;
virtual void xhrSucceeded(LocalFrame*) override;
@@ -181,14 +181,18 @@ public:
virtual void didUpdateTopControls() const override;
private:
- virtual bool isChromeClientImpl() const override { return true; }
+ bool isChromeClientImpl() const override { return true; }
+ void registerPopupOpeningObserver(PopupOpeningObserver*) override;
+ void unregisterPopupOpeningObserver(PopupOpeningObserver*) override;
+ void notifyPopupOpeningObservers() const;
void setCursor(const WebCursorInfo&);
WebViewImpl* m_webView; // weak pointer
WindowFeatures m_windowFeatures;
PagePopupDriver* m_pagePopupDriver;
+ Vector<PopupOpeningObserver*> m_popupOpeningObservers;
};
DEFINE_TYPE_CASTS(ChromeClientImpl, ChromeClient, client, client->isChromeClientImpl(), client.isChromeClientImpl());

Powered by Google App Engine
This is Rietveld 408576698