Clean up Automation and Chrome Frame IPC code.

chrome_frame/chrome_active_document.cc

 // 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.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 597 matching lines @@
           in_place_frame_->SetActiveObject(in_place_active_object, NULL);
         if (in_place_ui_window)
           in_place_ui_window->SetActiveObject(in_place_active_object, NULL);
       }
     }
   }
   m_spClientSite->ShowObject();
   return S_OK;
 }
 
-void ChromeActiveDocument::OnNavigationStateChanged(int tab_handle, int flags,
-    const IPC::NavigationInfo& nav_info) {
+void ChromeActiveDocument::OnNavigationStateChanged(
+    int flags, const NavigationInfo& nav_info) {
   // TODO(joshia): handle INVALIDATE_TAB,INVALIDATE_LOAD etc.
   DVLOG(1) << __FUNCTION__
            << "\n Flags: " << flags
            << ", Url: " << nav_info.url
            << ", Title: " << nav_info.title
            << ", Type: " << nav_info.navigation_type
            << ", Relative Offset: " << nav_info.relative_offset
            << ", Index: " << nav_info.navigation_index;
 
   UpdateNavigationState(nav_info);
 }
 
-void ChromeActiveDocument::OnUpdateTargetUrl(int tab_handle,
+void ChromeActiveDocument::OnUpdateTargetUrl(
     const std::wstring& new_target_url) {
   if (in_place_frame_)
     in_place_frame_->SetStatusText(new_target_url.c_str());
 }
 
 bool IsFindAccelerator(const MSG& msg) {
   // TODO(robertshield): This may not stand up to localization. Fix if this
   // is the case.
   return msg.message == WM_KEYDOWN && msg.wParam == 'F' &&
          win_util::IsCtrlPressed() &&
          !(win_util::IsAltPressed() || win_util::IsShiftPressed());
 }
 
-void ChromeActiveDocument::OnAcceleratorPressed(int tab_handle,
-                                                const MSG& accel_message) {
+void ChromeActiveDocument::OnAcceleratorPressed(const MSG& accel_message) {
   if (::TranslateAccelerator(m_hWnd, accelerator_table_,
                              const_cast<MSG*>(&accel_message)))
     return;
 
   bool handled_accel = false;
   if (in_place_frame_ != NULL) {
     handled_accel = (S_OK == in_place_frame_->TranslateAcceleratorW(
         const_cast<MSG*>(&accel_message), 0));
   }
 
   if (!handled_accel) {
     if (IsFindAccelerator(accel_message)) {
       // Handle the showing of the find dialog explicitly.
       OnFindInPage();
     } else {
-      BaseActiveX::OnAcceleratorPressed(tab_handle, accel_message);
+      BaseActiveX::OnAcceleratorPressed(accel_message);
     }
   } else {
     DVLOG(1) << "IE handled accel key " << accel_message.wParam;
   }
 }
 
-void ChromeActiveDocument::OnTabbedOut(int tab_handle, bool reverse) {
+void ChromeActiveDocument::OnTabbedOut(bool reverse) {
   DVLOG(1) << __FUNCTION__;
   if (in_place_frame_) {
     MSG msg = { NULL, WM_KEYDOWN, VK_TAB };
     in_place_frame_->TranslateAcceleratorW(&msg, 0);
   }
 }
 
-void ChromeActiveDocument::OnDidNavigate(int tab_handle,
-                                         const IPC::NavigationInfo& nav_info) {
+void ChromeActiveDocument::OnDidNavigate(const NavigationInfo& nav_info) {
   DVLOG(1) << __FUNCTION__ << std::endl
            << "Url: " << nav_info.url
            << ", Title: " << nav_info.title
            << ", Type: " << nav_info.navigation_type
            << ", Relative Offset: " << nav_info.relative_offset
            << ", Index: " << nav_info.navigation_index;
 
   CrashMetricsReporter::GetInstance()->IncrementMetric(
       CrashMetricsReporter::CHROME_FRAME_NAVIGATION_COUNT);
 
   // This could be NULL if the active document instance is being destroyed.
   if (!m_spInPlaceSite) {
     DVLOG(1) << __FUNCTION__ << "m_spInPlaceSite is NULL. Returning";
     return;
   }
 
   UpdateNavigationState(nav_info);
 }
 
-void ChromeActiveDocument::OnCloseTab(int tab_handle) {
+void ChromeActiveDocument::OnCloseTab() {
   // Base class will fire DIChromeFrameEvents::onclose.
-  BaseActiveX::OnCloseTab(tab_handle);
+  BaseActiveX::OnCloseTab();
 
   // Close the container window.
   ScopedComPtr<IWebBrowser2> web_browser2;
   DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive());
   if (web_browser2)
     web_browser2->Quit();
 }
 
 void ChromeActiveDocument::UpdateNavigationState(
-    const IPC::NavigationInfo& new_navigation_info) {
+    const NavigationInfo& new_navigation_info) {
   HRESULT hr = S_OK;
   bool is_title_changed = (navigation_info_.title != new_navigation_info.title);
   bool is_ssl_state_changed =
       (navigation_info_.security_style != new_navigation_info.security_style) ||
       (navigation_info_.displayed_insecure_content !=
           new_navigation_info.displayed_insecure_content) ||
       (navigation_info_.ran_insecure_content !=
           new_navigation_info.ran_insecure_content);
 
   if (is_ssl_state_changed) {
@@ skipping 190 matching lines @@
                                     VARIANT* in_args,
                                     VARIANT* out_args) {
   if (IsValid() && out_args) {
     bool should_unload = true;
     automation_client_->OnUnload(&should_unload);
     out_args->vt = VT_BOOL;
     out_args->boolVal = should_unload ? VARIANT_TRUE : VARIANT_FALSE;
   }
 }
 
-void ChromeActiveDocument::OnOpenURL(int tab_handle,
-                                     const GURL& url_to_open,
+void ChromeActiveDocument::OnOpenURL(const GURL& url_to_open,
                                      const GURL& referrer,
                                      int open_disposition) {
   // If the disposition indicates that we should be opening the URL in the
   // current tab, then we can reuse the ChromeFrameAutomationClient instance
   // maintained by the current ChromeActiveDocument instance. We cache this
   // instance so that it can be used by the new ChromeActiveDocument instance
   // which may be instantiated for handling the new URL.
   if (open_disposition == CURRENT_TAB) {
     // Grab a reference to ensure that the document remains valid.
     AddRef();
     g_active_doc_cache.Set(this);
   }
 
-  BaseActiveX::OnOpenURL(tab_handle, url_to_open, referrer, open_disposition);
+  BaseActiveX::OnOpenURL(url_to_open, referrer, open_disposition);
 }
 
-void ChromeActiveDocument::OnAttachExternalTab(int tab_handle,
-    const IPC::AttachExternalTabParams& params) {
+void ChromeActiveDocument::OnAttachExternalTab(
+    const AttachExternalTabParams& params) {
   if (!automation_client_.get()) {
     DLOG(WARNING) << "Invalid automation client instance";
     return;
   }
   DWORD flags = 0;
   if (params.user_gesture)
     flags = NWMF_USERREQUESTED;
   else if (popup_allowed_)
     flags = NWMF_USERALLOWED;
 
   HRESULT hr = S_OK;
   if (popup_manager_) {
     const std::wstring& url_wide = UTF8ToWide(params.url.spec());
     hr = popup_manager_->EvaluateNewWindow(url_wide.c_str(), NULL, url_,
         NULL, FALSE, flags, 0);
   }
   // Allow popup
   if (hr == S_OK) {
-    BaseActiveX::OnAttachExternalTab(tab_handle, params);
+    BaseActiveX::OnAttachExternalTab(params);
     return;
   }
 
   automation_client_->BlockExternalTab(params.cookie);
 }
 
 bool ChromeActiveDocument::PreProcessContextMenu(HMENU menu) {
   ScopedComPtr<IBrowserService> browser_service;
   ScopedComPtr<ITravelLog> travel_log;
   GetBrowserServiceAndTravelLog(browser_service.Receive(),
                                 travel_log.Receive());
   if (!browser_service || !travel_log)
     return true;
 
   EnableMenuItem(menu, IDC_BACK, MF_BYCOMMAND |
       (SUCCEEDED(travel_log->GetTravelEntry(browser_service, TLOG_BACK,
                                             NULL)) ?
       MF_ENABLED : MF_DISABLED));
   EnableMenuItem(menu, IDC_FORWARD, MF_BYCOMMAND |
       (SUCCEEDED(travel_log->GetTravelEntry(browser_service, TLOG_FORE,
                                             NULL)) ?
       MF_ENABLED : MF_DISABLED));
   // Call base class (adds 'About' item)
   return BaseActiveX::PreProcessContextMenu(menu);
 }
 
-bool ChromeActiveDocument::HandleContextMenuCommand(UINT cmd,
-    const IPC::MiniContextMenuParams& params) {
+bool ChromeActiveDocument::HandleContextMenuCommand(
+    UINT cmd, const MiniContextMenuParams& params) {
   ScopedComPtr<IWebBrowser2> web_browser2;
   DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive());
 
   if (cmd == IDC_BACK)
     web_browser2->GoBack();
   else if (cmd == IDC_FORWARD)
     web_browser2->GoForward();
   else if (cmd == IDC_RELOAD)
     web_browser2->Refresh();
   else
@@ skipping 227 matching lines @@
     tab->OverrideEncoding(chrome_encoding_name);
 
   // Like we did on SetPageFontSize, we may forward the command back to IEFrame
   // to update the menu state to indicate that which encoding was set.
   // TODO(iyengar)
   // Do some investigation into why this Exec call fails.
   IEExec(&CGID_ExplorerBarDoc, command_id, cmd_exec_opt, NULL, NULL);
   return S_OK;
 }
 
-void ChromeActiveDocument::OnGoToHistoryEntryOffset(int tab_handle,
-                                                    int offset) {
+void ChromeActiveDocument::OnGoToHistoryEntryOffset(int offset) {
   DVLOG(1) <<  __FUNCTION__ << " - offset:" << offset;
 
   ScopedComPtr<IBrowserService> browser_service;
   ScopedComPtr<ITravelLog> travel_log;
   GetBrowserServiceAndTravelLog(browser_service.Receive(),
                                 travel_log.Receive());
 
   if (browser_service && travel_log)
     travel_log->Travel(browser_service, offset);
 }
@@ skipping 112 matching lines @@
     web_browser2->put_Height(dimensions_.height());
     web_browser2->put_Left(dimensions_.x());
     web_browser2->put_Top(dimensions_.y());
 
     dimensions_.set_height(0);
     dimensions_.set_width(0);
   }
 }
 
 bool ChromeActiveDocument::IsNewNavigation(
-    const IPC::NavigationInfo& new_navigation_info) const {
+    const NavigationInfo& new_navigation_info) const {
   // A new navigation is typically an internal navigation which is initiated by
   // the renderer(WebKit). Condition 1 below has to be true along with the
   // any of the other conditions below.
   // 1. The navigation index is greater than 0 which means that a top level
   //    navigation was initiated on the current external tab.
   // 2. The navigation type has changed.
   // 3. The url or the referrer are different.
   if (new_navigation_info.navigation_index <= 0)
     return false;
 
   if (new_navigation_info.navigation_index ==
       navigation_info_.navigation_index)
     return false;
 
   if (new_navigation_info.navigation_type != navigation_info_.navigation_type)
     return true;
 
   if (new_navigation_info.url != navigation_info_.url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_.referrer)
     return true;
 
   return false;
 }