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/bho.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/bho.h')
| -rw-r--r-- | chrome_frame/bho.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h index bae3385..d1f232d 100644 --- a/chrome_frame/bho.h +++ b/chrome_frame/bho.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. @@ -48,11 +48,11 @@ class PatchHelper { extern PatchHelper g_patch_helper; class ATL_NO_VTABLE Bho - : public CComObjectRootEx<CComSingleThreadModel>, - public CComCoClass<Bho, &CLSID_ChromeFrameBHO>, - public IObjectWithSiteImpl<Bho>, - public IDispEventSimpleImpl<0, Bho, &DIID_DWebBrowserEvents2>, - public NavigationManager { + : public CComObjectRootEx<CComSingleThreadModel>, + public CComCoClass<Bho, &CLSID_ChromeFrameBHO>, + public IObjectWithSiteImpl<Bho>, + public IDispEventSimpleImpl<0, Bho, &DIID_DWebBrowserEvents2>, + public NavigationManager { public: typedef HRESULT (STDMETHODCALLTYPE* IBrowserService_OnHttpEquiv_Fn)( IBrowserService* browser, IShellView* shell_view, BOOL done, |