Add rudimentary support in the ChromeFrame ActiveX to enable it work in a generic client site, i.e.

chrome_frame/chrome_frame_activex.cc

 // Copyright (c) 2011 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>
@@ skipping 129 matching lines @@
                             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) {
+    : chrome_wndproc_hook_(NULL),
+      attaching_to_existing_cf_tab_(false) {
   TRACE_EVENT_BEGIN_ETW("chromeframe.createactivex", this, "");
 }
 
 HRESULT ChromeFrameActivex::FinalConstruct() {
   HRESULT hr = Base::FinalConstruct();
   if (FAILED(hr))
     return hr;
 
   // No need to call FireOnChanged at this point since nobody will be listening.
   ready_state_ = READYSTATE_LOADING;
@@ skipping 242 matching lines @@
 
 STDMETHODIMP ChromeFrameActivex::put_src(BSTR src) {
   GURL document_url(GetDocumentUrl());
   if (document_url.SchemeIsSecure()) {
     GURL source_url(src);
     if (!source_url.SchemeIsSecure()) {
       Base::put_src(base::win::ScopedBstr(g_activex_insecure_content_error));
       return E_ACCESSDENIED;
     }
   }
-  return Base::put_src(src);
+  HRESULT hr = S_OK;
+  // If we are connecting to an existing ExternalTabContainer instance in
+  // Chrome then we should wait for Chrome to initiate the navigation.
+  if (!attaching_to_existing_cf_tab_) {
+    hr = Base::put_src(src);
+  } else {
+    url_.Reset(::SysAllocString(src));
+    attaching_to_existing_cf_tab_ = false;
+  }
+  return S_OK;
 }
 
 HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
     IOleClientSite* client_site) {
   HRESULT hr = Base::IOleObject_SetClientSite(client_site);
   if (FAILED(hr) || !client_site) {
     EventHandlers* handlers[] = {
       &onmessage_,
       &onloaderror_,
       &onload_,
@@ skipping 39 matching lines @@
         profile_name.assign(profile_name_arg, profile_name_arg.Length());
     }
 
     std::string utf8_url;
     if (url_.Length()) {
       WideToUTF8(url_, url_.Length(), &utf8_url);
     }
 
     InitializeAutomationSettings();
 
+    if (service) {
+      base::win::ScopedBstr navigation_url;
+      service->GetNavigationUrl(navigation_url.Receive());
+      if (navigation_url.Length()) {
+        ChromeFrameUrl cf_url;
+        cf_url.Parse(navigation_url.operator BSTR());
+        if (cf_url.attach_to_external_tab()) {
+          automation_client_->AttachExternalTab(cf_url.cookie());
+          attaching_to_existing_cf_tab_ = true;
+        }
+      }
+    }
     url_fetcher_->set_frame_busting(!is_privileged());
     automation_client_->SetUrlFetcher(url_fetcher_.get());
     if (!InitializeAutomation(profile_name, IsIEInPrivate(), true,
                               GURL(utf8_url), GURL(), false)) {
       DLOG(ERROR) << "Failed to navigate to url:" << utf8_url;
       return E_FAIL;
     }
 
     // Log a metric that Chrome Frame is being used in Widget mode
     UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET);
@@ skipping 190 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;
 }