summaryrefslogtreecommitdiffstats
path: root/chrome_frame/http_negotiate.h
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 19:28:50 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-12 19:28:50 +0000
commit6e58a95b99e1c88172d5eae8925c8dfa39c2b765 (patch)
tree77e93bb7e93198024c36e5a6bba434b9412820ac /chrome_frame/http_negotiate.h
parentf24a74a242f8605d43085d6cc0cb36e5e376b2d4 (diff)
downloadchromium_src-6e58a95b99e1c88172d5eae8925c8dfa39c2b765.zip
chromium_src-6e58a95b99e1c88172d5eae8925c8dfa39c2b765.tar.gz
chromium_src-6e58a95b99e1c88172d5eae8925c8dfa39c2b765.tar.bz2
Integrate the Ready Mode prompt with IE and Chrome Frame. In Ready Mode, prompts are displayed when the user browses to GCF-enabled sites, allowing the user to permanently activate, permanently decline, or temporarily decline Chrome Frame.
BUG=None TEST=chrome_frame_unittests --gtest_filter=Ready* && chrome_frame_unittests --gtest_filter=Infobar* && setup.exe --chrome-frame --ready-mode --multi-install --system--level --chrome Review URL: http://codereview.chromium.org/6040003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/http_negotiate.h')
-rw-r--r--chrome_frame/http_negotiate.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome_frame/http_negotiate.h b/chrome_frame/http_negotiate.h
index eb17c7f..70a3ca2 100644
--- a/chrome_frame/http_negotiate.h
+++ b/chrome_frame/http_negotiate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -6,9 +6,10 @@
#define CHROME_FRAME_HTTP_NEGOTIATE_H_
#include <shdeprecated.h>
-#include <string>
#include <urlmon.h>
+#include <string>
+
#include "base/basictypes.h"
#include "base/scoped_comptr_win.h"
@@ -47,6 +48,10 @@ class HttpNegotiatePatch {
static bool Initialize();
static void Uninitialize();
+ // Enables and disables the User Agent header modification. It is enabled
+ // by default when the patch is installed.
+ static void set_modify_user_agent(bool value) { modify_user_agent_ = value; }
+
// IHttpNegotiate patch methods
static STDMETHODIMP BeginningTransaction(
IHttpNegotiate_BeginningTransaction_Fn original, IHttpNegotiate* me,
@@ -56,6 +61,8 @@ class HttpNegotiatePatch {
static HRESULT PatchHttpNegotiate(IUnknown* to_patch);
private:
+ static bool modify_user_agent_;
+
DISALLOW_COPY_AND_ASSIGN(HttpNegotiatePatch);
};