Add a setting to CF to remove 'chromeframe' from the UserAgent on a per-pattern basis.

chrome_frame/utils.h

 // Copyright (c) 2012 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_UTILS_H_
 #define CHROME_FRAME_UTILS_H_
 
 #include <OAidl.h>
 #include <objidl.h>
 #include <windows.h>
 #include <wininet.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "base/string16.h"
 #include "base/threading/thread.h"
 #include "base/win/scoped_comptr.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 class FilePath;
 interface IBrowserService;
 interface IWebBrowser2;
 struct ContextMenuModel;
 
 // utils.h : Various utility functions and classes
+extern const char kGCFProtocol[];
 
+extern const wchar_t kAllowUnsafeURLs[];
 extern const wchar_t kChromeContentPrefix[];
-extern const char kGCFProtocol[];
-extern const wchar_t kChromeProtocolPrefix[];
-extern const wchar_t kChromeFrameHeadlessMode[];
 extern const wchar_t kChromeFrameAccessibleMode[];
-extern const wchar_t kChromeFrameUnpinnedMode[];
-extern const wchar_t kAllowUnsafeURLs[];
-extern const wchar_t kEnableBuggyBhoIntercept[];
-extern const wchar_t kChromeMimeType[];
 extern const wchar_t kChromeFrameAttachTabPattern[];
 extern const wchar_t kChromeFrameConfigKey[];
+extern const wchar_t kChromeFrameHeadlessMode[];
+extern const wchar_t kChromeFrameUnpinnedMode[];
+extern const wchar_t kChromeMimeType[];
+extern const wchar_t kChromeProtocolPrefix[];
+extern const wchar_t kEnableBuggyBhoIntercept[];
+extern const wchar_t kEnableGCFRendererByDefault[];
+extern const wchar_t kExcludeUAFromDomainList[];
+extern const wchar_t kIexploreProfileName[];
 extern const wchar_t kRenderInGCFUrlList[];
 extern const wchar_t kRenderInHostUrlList[];
-extern const wchar_t kEnableGCFRendererByDefault[];
-extern const wchar_t kIexploreProfileName[];
 extern const wchar_t kRundllProfileName[];
 extern const wchar_t kUseBackgroundThreadForSubResources[];
 
 // This function is very similar to the AtlRegisterTypeLib function except
 // that it takes a parameter that specifies whether to register the typelib
 // for the current user only or on a machine-wide basis
 // Refer to the MSDN documentation for AtlRegisterTypeLib for a description of
 // the arguments
 HRESULT UtilRegisterTypeLib(HINSTANCE tlb_instance,
                             LPCOLESTR index,
@@ skipping 122 matching lines @@
   RENDERER_TYPE_CHROME_HTTP_EQUIV,
   RENDERER_TYPE_CHROME_RESPONSE_HEADER,
   RENDERER_TYPE_CHROME_DEFAULT_RENDERER,
   RENDERER_TYPE_CHROME_OPT_IN_URL,
   RENDERER_TYPE_CHROME_WIDGET,
   // NOTE: all _CHOME_ values must go above here (adjust MIN/MAX as needed).
   RENDERER_TYPE_CHROME_MAX = RENDERER_TYPE_CHROME_WIDGET,
   RENDERER_TYPE_OTHER,
 };
 
+enum UserAgentAction {
+  USER_AGENT_DEFAULT,
+  USER_AGENT_REMOVE
+};
+
 // Returns true if the given RendererType represents Chrome.
 bool IsChrome(RendererType renderer_type);
 
 // Convenience macro for logging a sample for the launch type metric.
 #define UMA_LAUNCH_TYPE_COUNT(sample) \
   UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.LaunchType", sample, \
   RENDERER_TYPE_CHROME_MIN, RENDERER_TYPE_CHROME_MAX, \
   RENDERER_TYPE_CHROME_MAX + 1 - RENDERER_TYPE_CHROME_MIN)
 
 // To get the IE version when Chrome Frame is hosted in IE.  Make sure that
@@ skipping 68 matching lines @@
 // Returns true if all HTML pages should be rendered in GCF by default.
 bool IsGcfDefaultRenderer();
 
 // Check if this url is opting into Chrome Frame based on static settings.
 // Returns one of:
 // - RENDERER_TYPE_UNDETERMINED if not opt-in or if explicit opt-out
 // - RENDERER_TYPE_CHROME_DEFAULT_RENDERER
 // - RENDERER_TYPE_CHROME_OPT_IN_URL
 RendererType RendererTypeForUrl(const std::wstring& url);
 
+// Check if we should try to remove the CF user agent based on registry
+// settings.
+UserAgentAction ShouldRemoveUAForUrl(const string16& url);

[grt (UTC plus 2), 2012/03/20 17:27:45]

since there are only two options and the function is called "ShouldBlahBlah," i
find it more intuitive for the return value to be a boolean.  if
(ShouldBlahBlah()) is more readable.

[robertshield, 2012/03/26 02:43:33]

Done.

+
 // A shortcut for QueryService
 template <typename T>
 HRESULT DoQueryService(const IID& service_id, IUnknown* unk, T** service) {
   DCHECK(service);
   if (!unk)
     return E_INVALIDARG;
 
   base::win::ScopedComPtr<IServiceProvider> service_provider;
   HRESULT hr = service_provider.QueryFrom(unk);
   if (service_provider)
@@ skipping 315 matching lines @@
 bool IsChromeFrameDocument(IWebBrowser2* web_browser);
 
 // Increases the wininet connection limit for HTTP 1.0/1.1 connections to the
 // value passed in. This is only done if the existing connection limit is
 // lesser than the connection limit passed in. This function attempts to
 // increase the connection count once per process.
 // Returns true on success.
 bool IncreaseWinInetConnections(DWORD connections);
 
 #endif  // CHROME_FRAME_UTILS_H_