Revert "Refactor automation messages." due to mysterious problems on mac.

chrome_frame/chrome_frame_activex_base.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_BASE_H_
 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 340 matching lines @@
     }
 
     if (client_site == NULL) {
       in_place_frame_.Release();
     }
 
     return CComControlBase::IOleObject_SetClientSite(client_site);
   }
 
   bool HandleContextMenuCommand(UINT cmd,
-                                const IPC::MiniContextMenuParams& params) {
+                                const IPC::ContextMenuParams& params) {
     if (cmd == IDC_ABOUT_CHROME_FRAME) {
       int tab_handle = automation_client_->tab()->handle();
       HostNavigate(GURL("about:version"), GURL(), NEW_WINDOW);
       return true;
     } else {
       switch (cmd) {
         case IDS_CONTENT_CONTEXT_SAVEAUDIOAS:
         case IDS_CONTENT_CONTEXT_SAVEVIDEOAS:
         case IDS_CONTENT_CONTEXT_SAVEIMAGEAS:
         case IDS_CONTENT_CONTEXT_SAVELINKAS: {
@@ skipping 140 matching lines @@
         params.dimensions.x(),
         params.dimensions.y(),
         params.dimensions.width(),
         params.dimensions.height(),
         params.profile_name.c_str());
     HostNavigate(GURL(url), GURL(), params.disposition);
   }
 
   virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
                                    int align_flags,
-                                   const IPC::MiniContextMenuParams& params) {
+                                   const IPC::ContextMenuParams& params) {
     scoped_refptr<BasePlugin> ref(this);
     ChromeFramePlugin<T>::OnHandleContextMenu(tab_handle, menu_handle,
                                               align_flags, params);
   }
 
   LRESULT OnCreate(UINT message, WPARAM wparam, LPARAM lparam,
                    BOOL& handled) {  // NO_LINT
     ModifyStyle(0, WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0);
     url_fetcher_->put_notification_window(m_hWnd);
     if (automation_client_.get()) {
@@ skipping 725 matching lines @@
   EventHandlers onextensionready_;
 
   // Handle network requests when host network stack is used. Passed to the
   // automation client on initialization.
   scoped_ptr<UrlmonUrlRequestManager> url_fetcher_;
 
   HINSTANCE prev_resource_instance_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_