Clean up Automation and Chrome Frame IPC code.

chrome_frame/cfproxy.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_FRAME_CFPROXY_H_
 #define CHROME_FRAME_CFPROXY_H_
 #pragma once
 
 #include <windows.h>
 #include <map>  // for proxy factory
 #include <vector>
 #include <string>
 #include "base/lock.h"
 #include "base/time.h"         // for base::TimeDelta
 #include "base/file_path.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/page_zoom.h"
+#include "ipc/ipc_channel.h"
 
 enum FindInPageDirection { BACK = 0, FWD = 1 };
 enum FindInPageCase { IGNORE_CASE = 0, CASE_SENSITIVE = 1 };
 // Specifies the font size on a page which is requested by an automation
 // client.
 enum AutomationPageFontSize {
   SMALLEST_FONT = 8,
   SMALL_FONT = 12,
   MEDIUM_FONT = 16,
   LARGE_FONT = 24,
   LARGEST_FONT = 36
 };
 
+class ChromeProxyDelegate;
+class ChromeProxyFactory;
+class GURL;
 class URLRequestStatus;
-namespace IPC {
-  struct ExternalTabSettings;
-  struct NavigationInfo;
-  struct AutomationURLRequest;
-  struct AttachExternalTabParams;
-  struct MiniContextMenuParams;
-};
-
-class GURL;
-class ChromeProxyFactory;
-class ChromeProxyDelegate;
+struct AttachExternalTabParams;
+struct AutomationURLRequest;
+struct ExternalTabSettings;
+struct MiniContextMenuParams;
+struct NavigationInfo;
 struct ProxyParams;
 
 // Some callers of synchronous messages wants a context to be passed back
 // in order to identify the call they made. Presumably one can make
 // multiple sync calls of same type (as async) and want to identify what
 // is what.
 struct SyncMessageContext {
   virtual ~SyncMessageContext() {}
 };
 
@@ skipping 29 matching lines @@
                                 SyncMessageContext* ctx) = 0;
   virtual void LoadExtension(ChromeProxyDelegate* delegate,
                              const FilePath& path,
                              SyncMessageContext* ctx) = 0;
   virtual void GetEnabledExtensions(ChromeProxyDelegate* delegate,
                                     SyncMessageContext* ctx) = 0;
   virtual void SetProxyConfig(const std::string& json_encoded_settings) = 0;
 
   // Tab management.
   virtual void CreateTab(ChromeProxyDelegate* delegate,
-                         const IPC::ExternalTabSettings& settings) = 0;
+                         const ExternalTabSettings& settings) = 0;
   virtual void ConnectTab(ChromeProxyDelegate* delegate, HWND hwnd,
                           uint64 cookie) = 0;
   virtual void BlockTab(uint64 cookie) = 0;
 
   // Tab related.
   virtual void Tab_PostMessage(int tab, const std::string& message,
                                const std::string& origin,
                                const std::string& target)  = 0;
   virtual void Tab_Reload(int tab) = 0;
   virtual void Tab_Stop(int tab) = 0;
@@ skipping 32 matching lines @@
   virtual void Init(const ProxyParams& params) = 0;
   virtual int AddDelegate(ChromeProxyDelegate* delegate) = 0;
   virtual int RemoveDelegate(ChromeProxyDelegate* delegate) = 0;
 };
 
 // The object that uses ChromeProxy should implement ChromeProxyDelegate in
 // order to get notified about important events/requests coming from the
 // instance of Chromium.
 // Allow only one delegate per tab, i.e. delegate can handle only a single tab.
 // Note: all of the methods are invoked always in a background IPC thread.
-class ChromeProxyDelegate {
+class ChromeProxyDelegate : public IPC::Channel::Listener {
  public:
   enum DisconnectReason {
     CHROME_EXE_LAUNCH_FAILED,
     CHROME_EXE_LAUNCH_TIMEOUT,
     CHANNEL_ERROR
   };
 
+  // IPC::Channel::Listener.
+  void OnMessageReceived(const IPC::Message& message) = 0;
+
   virtual void Connected(ChromeProxy* proxy) = 0;
   virtual void Disconnected() = 0;
   virtual void PeerLost(ChromeProxy* proxy, DisconnectReason reason) = 0;
   virtual int tab_handle() = 0;   // to avoid reverse lookup :)
 
   // Sync message responses.
   virtual void Completed_CreateTab(bool success, HWND chrome_wnd,
       HWND tab_window, int tab_handle, int session_id) = 0;
   virtual void Completed_ConnectToTab(bool success, HWND chrome_window,
       HWND tab_window, int tab_handle, int session_id) = 0;
   virtual void Completed_Navigate(bool success,
       enum AutomationMsg_NavigationResponseValues res) = 0;
   virtual void Completed_InstallExtension(bool success,
       AutomationMsg_ExtensionResponseValues res, SyncMessageContext* ctx) = 0;
   virtual void Completed_LoadExpandedExtension(bool success,
       AutomationMsg_ExtensionResponseValues res, SyncMessageContext* ctx) = 0;
   virtual void Completed_GetEnabledExtensions(bool success,
       const std::vector<FilePath>* extensions) = 0;
 
-  // Network requests from Chrome.
-  virtual void Network_Start(int request_id,
-      const IPC::AutomationURLRequest& request_info) = 0;
-  virtual void Network_Read(int request_id, int bytes_to_read) = 0;
-  virtual void Network_End(int request_id, const URLRequestStatus& status) = 0;
-  virtual void Network_DownloadInHost(int request_id) = 0;
-  virtual void GetCookies(const GURL& url, int cookie_id) = 0;
-  virtual void SetCookie(const GURL& url, const std::string& cookie) = 0;
-
-  // Navigation progress notifications.
-  virtual void NavigationStateChanged(int flags,
-                                      const IPC::NavigationInfo& nav_info) = 0;
-  virtual void UpdateTargetUrl(const std::wstring& url) = 0;
-  virtual void NavigationFailed(int error_code, const GURL& gurl) = 0;
-  virtual void DidNavigate(const IPC::NavigationInfo& navigation_info) = 0;
-  virtual void TabLoaded(const GURL& url) = 0;
-
-  // Navigation and messaging.
-  virtual void OpenURL(const GURL& url_to_open, const GURL& referrer,
-                       int open_disposition) = 0;
-  virtual void GoToHistoryOffset(int offset) = 0;
-  virtual void MessageToHost(const std::string& message,
-                             const std::string& origin,
-                             const std::string& target) = 0;
-  // Misc. UI.
-  virtual void HandleAccelerator(const MSG& accel_message) = 0;
-  virtual void HandleContextMenu(HANDLE menu_handle, int align_flags,
-                                 const IPC::MiniContextMenuParams& params) = 0;
-  virtual void TabbedOut(bool reverse) = 0;
-
-  // Tab related.
-  virtual void TabClosed() = 0;
-  virtual void AttachTab(const IPC::AttachExternalTabParams& attach_params) = 0;
  protected:
   ~ChromeProxyDelegate() {}
 };
 
 // a way to obtain a ChromeProxy implementation
 struct ProxyParams {
   std::string profile;
   std::wstring extra_params;
   FilePath profile_path;
   base::TimeDelta timeout;
 };
 
 class ChromeProxyFactory {
  public:
   ChromeProxyFactory();
   ~ChromeProxyFactory();
   void GetProxy(ChromeProxyDelegate* delegate, const ProxyParams& params);
   bool ReleaseProxy(ChromeProxyDelegate* delegate, const std::string& profile);
  protected:
   virtual ChromeProxy* CreateProxy();
   typedef std::map<std::string, ChromeProxy*> ProxyMap;
   ProxyMap proxies_;
   Lock lock_;
 };
 
 #endif  // CHROME_FRAME_CFPROXY_H_