Committing http://codereview.chromium.org/3420004/show for grt@...

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 242 matching lines @@
                                   mgr ? mgr->url(): std::wstring());
   }
 
   ChromeFrameUrl cf_url;
   if (!cf_url.Parse(url)) {
     DLOG(WARNING) << __FUNCTION__ << " Failed to parse url:" << url;
     return E_INVALIDARG;
   }
 
   std::string referrer(mgr ? mgr->referrer() : EmptyString());
+  RendererType renderer_type = cf_url.is_chrome_protocol() ?
+      RENDERER_TYPE_CHROME_GCF_PROTOCOL : RENDERER_TYPE_UNDETERMINED;
 
   // With CTransaction patch we have more robust way to grab the referrer for
   // each top-level-switch-to-CF request by peeking at our sniffing data
-  // object that lives inside the bind context.
+  // object that lives inside the bind context.  We also remember the reason
+  // we're rendering the document in Chrome.
   if (g_patch_helper.state() == PatchHelper::PATCH_PROTOCOL && info) {
     scoped_refptr<ProtData> prot_data = info->get_prot_data();
-    if (prot_data)
+    if (prot_data) {
       referrer = prot_data->referrer();
+      renderer_type = prot_data->renderer_type();
+    }
   }
 
   // For gcf: URLs allow only about and view-source schemes to pass through for
   // further inspection.
   bool is_safe_scheme = cf_url.gurl().SchemeIs(chrome::kAboutScheme) ||
       cf_url.gurl().SchemeIs(chrome::kViewSourceScheme);
   if (cf_url.is_chrome_protocol() && !is_safe_scheme &&
       !GetConfigBool(false, kAllowUnsafeURLs)) {
     DLOG(ERROR) << __FUNCTION__ << " gcf: not allowed:" << url;
     return E_INVALIDARG;
   }
 
   if (!LaunchUrl(cf_url, referrer)) {
     DLOG(ERROR) << __FUNCTION__ << " Failed to launch url:" << url;
     return E_INVALIDARG;
   }
 
   if (!cf_url.is_chrome_protocol() && !cf_url.attach_to_external_tab())
     url_fetcher_->SetInfoForUrl(url.c_str(), moniker_name, bind_context);
 
-  THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.FullTabLaunchType",
-                                          cf_url.is_chrome_protocol(),
-                                          0, 1, 2);
+  // Log a metric indicating why GCF is rendering in Chrome.
+  // (Note: we only track the renderer type when using the CTransaction patch.
+  // When the code for the browser service patch and for the moniker patch is
+  // removed, this conditional can also go away.)
+  if (RENDERER_TYPE_UNDETERMINED != renderer_type) {
+    THREAD_SAFE_UMA_LAUNCH_TYPE_COUNT(renderer_type);
+  }
+
   return S_OK;
 }
 
 STDMETHODIMP ChromeActiveDocument::Save(IMoniker* moniker_name,
                                         LPBC bind_context,
                                         BOOL remember) {
   return E_NOTIMPL;
 }
 
 STDMETHODIMP ChromeActiveDocument::SaveCompleted(IMoniker* moniker_name,
@@ skipping 983 matching lines @@
     web_browser2->put_Height(dimensions_.height());
     web_browser2->put_Left(dimensions_.x());
     web_browser2->put_Top(dimensions_.y());
     web_browser2->put_MenuBar(VARIANT_FALSE);
     web_browser2->put_ToolBar(VARIANT_FALSE);
 
     dimensions_.set_height(0);
     dimensions_.set_width(0);
   }
 }