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/chrome_frame.gyp | |
| 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/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 0a25451..00785be 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -859,15 +859,17 @@ 'policy_settings.h', 'protocol_sink_wrap.cc', 'protocol_sink_wrap.h', - 'ready_mode/internal/installation_state.h', 'ready_mode/internal/ready_mode_state.h', + 'ready_mode/internal/ready_mode_web_browser_adapter.cc', + 'ready_mode/internal/ready_mode_web_browser_adapter.h', 'ready_mode/internal/ready_prompt_content.cc', 'ready_mode/internal/ready_prompt_content.h', 'ready_mode/internal/ready_prompt_window.cc', 'ready_mode/internal/ready_prompt_window.h', 'ready_mode/internal/registry_ready_mode_state.cc', 'ready_mode/internal/registry_ready_mode_state.h', - 'ready_mode/ready_mode_manager.h', + 'ready_mode/ready_mode.cc', + 'ready_mode/ready_mode.h', 'register_bho.rgs', 'stream_impl.cc', 'stream_impl.h', |