Implement Mac Pop-up Dictionary for OOPIF.

content/renderer/text_input_client_observer.h

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..9260f6de595a3a87265b525ebf4278b8d59657e5 100644
--- a/content/renderer/text_input_client_observer.h
+++ b/content/renderer/text_input_client_observer.h
@@ -17,25 +17,32 @@ 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:
+  // IPC::Listener override.
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  // IPC::Sender override.
+  bool Send(IPC::Message* message) override;
+
  private:
-  // RenderViewObserver implementation.
-  void OnDestruct() override;
+  // The render widget corresponding to this TextInputClientObserver.
+  RenderWidget* GetRenderWidget();
+
+  // Returns the WebView corresponding to the page.
+  blink::WebView* GetWebView();
 
-  // Returns the WebView of the RenderView.
-  blink::WebView* webview();
+  // The routing ID of the RenderWidget.
+  int32_t GetRoutingID();
 
   // IPC Message handlers:
   void OnStringAtPoint(gfx::Point point);
@@ -43,9 +50,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);
 };