Clean up Automation and Chrome Frame IPC code.

chrome_frame/chrome_frame_activex.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_CHROME_FRAME_ACTIVEX_H_
 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 72 matching lines @@
   STDMETHOD(put_src)(BSTR src);
 
   // IChromeFrame
   // On a fresh install of ChromeFrame the BHO will not be loaded in existing
   // IE tabs/windows. This function instantiates the BHO and registers it
   // explicitly.
   STDMETHOD(registerBhoIfNeeded)();
 
  protected:
   // ChromeFrameDelegate overrides
-  virtual void OnLoad(int tab_handle, const GURL& url);
-  virtual void OnMessageFromChromeFrame(int tab_handle,
-                                        const std::string& message,
+  virtual void OnLoad(const GURL& url);
+  virtual void OnMessageFromChromeFrame(const std::string& message,
                                         const std::string& origin,
                                         const std::string& target);
   virtual void OnLoadFailed(int error_code, const std::string& url);
   virtual void OnAutomationServerLaunchFailed(
       AutomationLaunchResult reason, const std::string& server_version);
   virtual void OnExtensionInstalled(const FilePath& path,
       void* user_data, AutomationMsg_ExtensionResponseValues response);
   virtual void OnGetEnabledExtensionsComplete(
       void* user_data,
       const std::vector<FilePath>& extension_directories);
@@ skipping 37 matching lines @@
                  BSTR target);
 
   // Installs a hook on the top-level window hosting the control.
   HRESULT InstallTopLevelHook(IOleClientSite* client_site);
 
   // A hook attached to the top-level window containing the ActiveX control.
   HHOOK chrome_wndproc_hook_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_