Add the chromeframe tag to the user agent header at runtime instead of statically in the registry.TEST=Try disabling GCF and see if the chromeframe tag in the user agent is still set. It should not be. Also make sure you don't have an older version installed... the chromeframe tag should not be in the registry - if it is, you've got an older version still registered. This should fix the issue with going to wave.google.com after disabling chrome frame and seeing the white page of death.R=amitBUG=22760

Review URL: http://codereview.chromium.org/259025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29370 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 47 insertions, 0 deletions

diff --git a/chrome_frame/http_negotiate.h b/chrome_frame/http_negotiate.h
new file mode 100644
index 0000000..4a22d9c
--- /dev/null
+++ b/chrome_frame/http_negotiate.h
@@ -0,0 +1,47 @@
+// Copyright (c) 2009 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_HTTP_NEGOTIATE_H_
+#define CHROME_FRAME_HTTP_NEGOTIATE_H_
+
+#include <urlmon.h>
+
+#include "base/basictypes.h"
+
+// Typedefs for IHttpNegotiate methods.
+typedef HRESULT (STDMETHODCALLTYPE* IHttpNegotiate_BeginningTransaction_Fn)(
+    IHttpNegotiate* me, LPCWSTR url, LPCWSTR headers, DWORD reserved,
+    LPWSTR* additional_headers);
+typedef HRESULT (STDMETHODCALLTYPE* IHttpNegotiate_OnResponse_Fn)(
+    IHttpNegotiate* me, DWORD response_code, LPCWSTR response_header,
+    LPCWSTR request_header, LPWSTR* additional_request_headers);
+
+// Patches methods of urlmon's IHttpNegotiate implementation for the purposes
+// of adding to the http user agent header.
+class HttpNegotiatePatch {
+  // class is not to be instantiated atm.
+  HttpNegotiatePatch();
+  ~HttpNegotiatePatch();
+
+ public:
+  static bool Initialize();
+  static void Uninitialize();
+
+  static STDMETHODIMP BeginningTransaction(
+      IHttpNegotiate_BeginningTransaction_Fn original, IHttpNegotiate* me,
+      LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR* additional_headers);
+
+  static STDMETHODIMP OnResponse(
+      IHttpNegotiate_OnResponse_Fn original, IHttpNegotiate* me,
+      DWORD response_code, LPCWSTR response_header, LPCWSTR request_header,
+      LPWSTR* additional_request_headers);
+
+ protected:
+  static HRESULT PatchHttpNegotiate(IUnknown* to_patch);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(HttpNegotiatePatch);
+};
+
+#endif  // CHROME_FRAME_HTTP_NEGOTIATE_H_