Index: content/renderer/text_input_client_observer.h |
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h |
index 2c538a61c2b9813b18ae21cbb734c1d0f96bf773..7b311a2e321f77b66e3abc5bf932393c32b97ad7 100644 |
--- a/content/renderer/text_input_client_observer.h |
+++ b/content/renderer/text_input_client_observer.h |
@@ -17,25 +17,31 @@ class WebView; |
namespace content { |
-class RenderViewImpl; |
+class RenderFrameImpl; |
+class RenderWidget; |
// This is the renderer-side message filter that generates the replies for the |
// messages sent by the TextInputClientMac. See |
// content/browser/renderer_host/text_input_client_mac.h for more information. |
-class TextInputClientObserver : public RenderViewObserver { |
+class TextInputClientObserver : public IPC::Listener, public IPC::Sender { |
public: |
- explicit TextInputClientObserver(RenderViewImpl* render_view); |
+ explicit TextInputClientObserver(RenderFrameImpl* render_frame); |
~TextInputClientObserver() override; |
// RenderViewObserver overrides: |
Charlie Reis
2016/09/02 21:57:47
Stale comment. (These now override from somewhere
EhsanK
2016/09/08 17:10:40
Done.
|
bool OnMessageReceived(const IPC::Message& message) override; |
+ bool Send(IPC::Message* message) override; |
+ |
private: |
- // RenderViewObserver implementation. |
- void OnDestruct() override; |
+ // The render widget corresponding to the local root. |
Charlie Reis
2016/09/02 21:57:47
This confuses me a bit. "Local root" refers to a
EhsanK
2016/09/08 17:10:40
Acknowledged. I think I meant the RenderFramImpl w
|
+ RenderWidget* GetRenderWidget(); |
// Returns the WebView of the RenderView. |
Charlie Reis
2016/09/02 21:57:48
Should this still mention RenderView?
EhsanK
2016/09/08 17:10:40
No I don't think it should.
|
- blink::WebView* webview(); |
+ blink::WebView* GetWebView(); |
+ |
+ // The routing ID of the RenderWidget. |
+ int32_t GetRoutingID(); |
// IPC Message handlers: |
void OnStringAtPoint(gfx::Point point); |
@@ -43,9 +49,8 @@ class TextInputClientObserver : public RenderViewObserver { |
void OnFirstRectForCharacterRange(gfx::Range range); |
void OnStringForRange(gfx::Range range); |
-#if defined(ENABLE_PLUGINS) |
- RenderViewImpl* const render_view_impl_; |
-#endif |
+ // RenderFrameImpl owning this instance of the observer. |
+ RenderFrameImpl* render_frame_; |
DISALLOW_COPY_AND_ASSIGN(TextInputClientObserver); |
}; |