Refactor automation messages.

chrome_frame/external_tab.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_EXTERNAL_TAB_H_
 #define CHROME_FRAME_EXTERNAL_TAB_H_
 #pragma once
 
 #include <windows.h>
 #include <atlbase.h>
 #include <atlwin.h>
 #include <vector>
 #include <string>
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "chrome/common//page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/page_zoom.h"
 #include "chrome_frame/cfproxy.h"
 #include "chrome_frame/task_marshaller.h"
 #include "googleurl/src/gurl.h"
 
 class Task;
 class CancelableTask;
 namespace base {
   class TimeDelta;
   class WaitableEvent;
 }
 
 namespace IPC {
   struct NavigationInfo;
-  struct ContextMenuParams;
+  struct MiniContextMenuParams;
 }
 
 // This is the delegate/callback interface that has to be implemented
 // by the customers of ExternalTabProxy class.
 class UIDelegate {
  public:
   virtual void OnNavigationStateChanged(int flags,
       const IPC::NavigationInfo& nav_info) = 0;
   virtual void OnUpdateTargetUrl(const std::wstring& new_target_url) = 0;
   virtual void OnExtensionInstalled(const FilePath& path, void* user_data,
       AutomationMsg_ExtensionResponseValues response) = 0;
   virtual void OnLoad(const GURL& url) = 0;
   virtual void OnMessageFromChromeFrame(const std::string& message,
       const std::string& origin, const std::string& target) = 0;
   virtual void OnHandleContextMenu(HANDLE menu_handle, int align_flags,
-      const IPC::ContextMenuParams& params) = 0;
+      const IPC::MiniContextMenuParams& params) = 0;
   virtual void OnHandleAccelerator(const MSG& accel_message) = 0;
   virtual void OnTabbedOut(bool reverse) = 0;
   virtual void OnGoToHistoryOffset(int offset) = 0;
   virtual void OnOpenURL(const GURL& url_to_open, const GURL& referrer,
                        int open_disposition) = 0;
  protected:
   ~UIDelegate() {}
 };
 
 struct CreateTabParams {
@@ skipping 99 matching lines @@
 
   virtual void OpenURL(const GURL& url_to_open, const GURL& referrer,
                        int open_disposition);
   virtual void GoToHistoryOffset(int offset);
   virtual void MessageToHost(const std::string& message,
       const std::string& origin, const std::string& target);
 
   // Misc. UI.
   virtual void HandleAccelerator(const MSG& accel_message);
   virtual void HandleContextMenu(HANDLE menu_handle, int align_flags,
-                                 const IPC::ContextMenuParams& params);
+                                 const IPC::MiniContextMenuParams& params);
   virtual void TabbedOut(bool reverse);
 
   // Other
   virtual void TabClosed();
   virtual void AttachTab(const IPC::AttachExternalTabParams& attach_params);
 
   // end of ChromeProxyDelegate methods
   //////////////////////////////////////////////////////////////////////////
   void Init();
   void Destroy();
@@ skipping 37 matching lines @@
     void Set(const GURL& gurl, const GURL& ref) {
       url = gurl;
       referrer = ref;
     }
   } pending_navigation_;
 
   ScopedComPtr<IInternetSecurityManager> security_manager_;
 };
 
 #endif  // CHROME_FRAME_EXTERNAL_TAB_H_