Remove includes of message headers in headers.

chrome_frame/chrome_frame_activex.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.
 
 #include "chrome_frame/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_variant.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "chrome_frame/utils.h"
 
 namespace {
 
 // Class used to maintain a mapping from top-level windows to ChromeFrameActivex
 // instances.
@@ skipping 72 matching lines @@
 
   // Note that this hook is installed as a LOCAL hook.
   return  ::SetWindowsHookEx(WH_CALLWNDPROC,
                              TopWindowProc,
                              NULL,
                              proc_thread);
 }
 
 }  // unnamed namespace
 
+namespace chrome_frame {
+std::string ActiveXCreateUrl(const GURL& parsed_url,
+                             const AttachExternalTabParams& params) {
+  return base::StringPrintf(
+      "%hs?attach_external_tab&%I64u&%d&%d&%d&%d&%d&%hs",
+      parsed_url.GetOrigin().spec().c_str(),
+      params.cookie,
+      params.disposition,
+      params.dimensions.x(),
+      params.dimensions.y(),
+      params.dimensions.width(),
+      params.dimensions.height(),
+      params.profile_name.c_str());
+}
+
+int GetDisposition(const AttachExternalTabParams& params) {
+  return params.disposition;
+}
+
+void GetMiniContextMenuData(UINT cmd,
+                            const MiniContextMenuParams& params,
+                            GURL* referrer,
+                            GURL* url) {
+  *referrer = params.frame_url.is_empty() ? params.page_url : params.frame_url;
+  *url = (cmd == IDS_CONTENT_CONTEXT_SAVELINKAS ?
+      params.link_url : params.src_url);
+}
+
+}  // namespace chrome_frame
+
 ChromeFrameActivex::ChromeFrameActivex()
     : chrome_wndproc_hook_(NULL) {
   TRACE_EVENT_BEGIN("chromeframe.createactivex", this, "");
 }
 
 HRESULT ChromeFrameActivex::FinalConstruct() {
   HRESULT hr = Base::FinalConstruct();
   if (FAILED(hr))
     return hr;
 
@@ skipping 566 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }