Clean up Automation and Chrome Frame IPC code.

chrome_frame/chrome_active_document.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_ACTIVE_DOCUMENT_H_
 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 262 matching lines @@
                               OnEncodingChange)
 
   EXEC_COMMAND_HANDLER_NO_ARGS(&CGID_ShellDocView, DOCHOST_DISPLAY_PRIVACY,
                                OnDisplayPrivacyInfo)
   EXEC_COMMAND_HANDLER(NULL, OLECMDID_OPTICAL_GETZOOMRANGE, OnGetZoomRange)
   EXEC_COMMAND_HANDLER(NULL, OLECMDID_OPTICAL_ZOOM, OnSetZoomRange)
   EXEC_COMMAND_HANDLER(NULL, OLECMDID_ONUNLOAD, OnUnload)
 END_EXEC_COMMAND_MAP()
 
   // IPCs from automation server.
-  virtual void OnNavigationStateChanged(int tab_handle, int flags,
-                                        const IPC::NavigationInfo& nav_info);
-  virtual void OnUpdateTargetUrl(int tab_handle,
-                                 const std::wstring& new_target_url);
-  virtual void OnAcceleratorPressed(int tab_handle, const MSG& accel_message);
-  virtual void OnTabbedOut(int tab_handle, bool reverse);
-  virtual void OnDidNavigate(int tab_handle,
-                             const IPC::NavigationInfo& nav_info);
-  virtual void OnCloseTab(int tab_handle);
+  virtual void OnNavigationStateChanged(
+      int flags, const NavigationInfo& nav_info);
+  virtual void OnUpdateTargetUrl(const std::wstring& new_target_url);
+  virtual void OnAcceleratorPressed(const MSG& accel_message);
+  virtual void OnTabbedOut(bool reverse);
+  virtual void OnDidNavigate(const NavigationInfo& nav_info);
+  virtual void OnCloseTab();
   // Override DoVerb
   STDMETHOD(DoVerb)(LONG verb,
                     LPMSG msg,
                     IOleClientSite* active_site,
                     LONG index,
                     HWND parent_window,
                     LPCRECT pos);
 
   // Override IOleInPlaceActiveObjectImpl::OnDocWindowActivate
   STDMETHOD(OnDocWindowActivate)(BOOL activate);
   STDMETHOD(TranslateAccelerator)(MSG* msg);
 
-  // IPersistMoniker methods
+  // IPersistMoniker methodsch
   STDMETHOD(GetClassID)(CLSID* class_id);
   STDMETHOD(IsDirty)();
   STDMETHOD(GetCurMoniker)(IMoniker** moniker_name);
   STDMETHOD(Load)(BOOL fully_avalable,
                   IMoniker* moniker_name,
                   LPBC bind_context,
                   DWORD mode);
   STDMETHOD(Save)(IMoniker* moniker_name,
                   LPBC bind_context,
                   BOOL remember);
@@ skipping 22 matching lines @@
   // IHTMLPrivateWindow methods
   STDMETHOD(GetAddressBarUrl)(BSTR* url);
 
   // ChromeFrameActivexBase overrides
   HRESULT IOleObject_SetClientSite(IOleClientSite* client_site);
 
   HRESULT ActiveXDocActivate(LONG verb);
 
   // Callbacks from ChromeFramePlugin<T>
   bool PreProcessContextMenu(HMENU menu);
-  bool HandleContextMenuCommand(UINT cmd,
-                                const IPC::MiniContextMenuParams& params);
+  bool HandleContextMenuCommand(UINT cmd, const MiniContextMenuParams& params);
 
  // ChromeFramePlugin overrides.
   virtual void OnAutomationServerReady();
 
   // IEnumPrivacyRecords
   STDMETHOD(Reset)();
   STDMETHOD(GetSize)(ULONG* size);
   STDMETHOD(GetPrivacyImpacted)(BOOL* privacy_impacted);
   STDMETHOD(Next)(BSTR* url, BSTR* policy, LONG* reserved, DWORD* flags);
 
   // NavigationConstraints overrides.
   bool IsSchemeAllowed(const GURL& url);
 
   // Accessor for InPlaceMenu.  Returns S_OK if set, S_FALSE if NULL.
   HRESULT GetInPlaceFrame(IOleInPlaceFrame** in_place_frame);
 
  protected:
   // ChromeFrameActivexBase overrides
-  virtual void OnOpenURL(int tab_handle, const GURL& url_to_open,
-                         const GURL& referrer, int open_disposition);
-  virtual void OnAttachExternalTab(int tab_handle,
-      const IPC::AttachExternalTabParams& params);
-  virtual void OnGoToHistoryEntryOffset(int tab_handle, int offset);
+  virtual void OnOpenURL(
+      const GURL& url_to_open, const GURL& referrer, int open_disposition);
+  virtual void OnAttachExternalTab(const AttachExternalTabParams& params);
+  virtual void OnGoToHistoryEntryOffset(int offset);
 
   // A helper method that updates our internal navigation state
   // as well as IE's navigation state (viz Title and current URL).
   // The navigation_flags is a TabContents::InvalidateTypes enum
-  void UpdateNavigationState(const IPC::NavigationInfo& nav_info);
+  void UpdateNavigationState(const NavigationInfo& nav_info);
 
   TabProxy* GetTabProxy() const {
     if (automation_client_.get())
       return automation_client_->tab();
     return NULL;
   }
 
   // Exec command handlers
   void OnFindInPage();
   void OnViewSource();
@@ skipping 52 matching lines @@
                        BOOL& handled);
   LRESULT OnSetFocus(UINT message, WPARAM wparam, LPARAM lparam,
                      BOOL& handled);
 
   // Sets the dimensions on the IE window. These dimensions are parsed out from
   // the information passed in from Chrome during window.open.
   void SetWindowDimensions();
 
   // Returns true if the NavigationInfo object passed in represents a new
   // navigation initiated by the renderer.
-  bool IsNewNavigation(const IPC::NavigationInfo& new_navigation_info) const;
+  bool IsNewNavigation(const NavigationInfo& new_navigation_info) const;
 
  protected:
   typedef std::map<int, OLECMDF> CommandStatusMap;
 
-  IPC::NavigationInfo navigation_info_;
+  NavigationInfo navigation_info_;
   bool is_doc_object_;
 
   // This indicates whether this is the first navigation in this
   // active document. It is initalize to true and it is set to false
   // after we get a navigation notification from Chrome
   bool first_navigation_;
 
   // Our find dialog
   CFFindDialog find_dialog_;
 
@@ skipping 19 matching lines @@
   UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
       next_privacy_record_;
 
   // Dimensions of the window. Used only when opening popups.
   gfx::Rect dimensions_;
  public:
   OLEINPLACEFRAMEINFO frame_info_;
 };
 
 #endif  // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_