diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 19:28:50 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 19:28:50 +0000 |
| commit | 6e58a95b99e1c88172d5eae8925c8dfa39c2b765 (patch) | |
| tree | 77e93bb7e93198024c36e5a6bba434b9412820ac /chrome_frame/protocol_sink_wrap.h | |
| parent | f24a74a242f8605d43085d6cc0cb36e5e376b2d4 (diff) | |
| download | chromium_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/protocol_sink_wrap.h')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_frame/protocol_sink_wrap.h b/chrome_frame/protocol_sink_wrap.h index 3c6897a..0f48429 100644 --- a/chrome_frame/protocol_sink_wrap.h +++ b/chrome_frame/protocol_sink_wrap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 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. @@ -68,6 +68,11 @@ END_COM_MAP() static base::win::ScopedComPtr<IInternetProtocolSink> CreateNewSink( IInternetProtocolSink* sink, ProtData* prot_data); + // Enables or disables activation of Chrome Frame via the X-UA-Compatible + // header or meta tag. The tag/header is respected by default. + static void set_ignore_xua(bool ignore_xua) { ignore_xua_ = ignore_xua; } + static bool ignore_xua() { return ignore_xua_; } + // Apparently this has to be public, to satisfy COM_INTERFACE_BLIND_DELEGATE IInternetProtocolSink* delegate() { return delegate_; @@ -78,6 +83,8 @@ END_COM_MAP() ~ProtocolSinkWrap(); private: + static bool ignore_xua_; + // IInternetProtocolSink methods STDMETHOD(Switch)(PROTOCOLDATA* protocol_data); STDMETHOD(ReportProgress)(ULONG status_code, LPCWSTR status_text); @@ -170,4 +177,3 @@ struct TransactionHooks { DECLSPEC_SELECTANY struct TransactionHooks g_trans_hooks; #endif // CHROME_FRAME_PROTOCOL_SINK_WRAP_H_ - |