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/installer/setup/setup_main.cc | |
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/installer/setup/setup_main.cc')
-rw-r--r-- | chrome/installer/setup/setup_main.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 96f93b9..5158bc0 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -25,6 +25,7 @@ #include "base/win/windows_version.h" #include "breakpad/src/client/windows/handler/exception_handler.h" #include "chrome/common/chrome_switches.h" +#include "chrome/installer/setup/chrome_frame_ready_mode.h" #include "chrome/installer/setup/install.h" #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/setup/setup_util.h" @@ -167,11 +168,11 @@ installer::InstallStatus RenameChromeExecutables( install_list->AddDeleteRegValueWorkItem(reg_root, version_key, google_update::kRegOldVersionField, - true); + REG_SZ); install_list->AddDeleteRegValueWorkItem(reg_root, version_key, google_update::kRegRenameCmdField, - true); + REG_SZ); } installer::InstallStatus ret = installer::RENAME_SUCCESSFUL; if (!install_list->Do()) { @@ -675,6 +676,14 @@ bool HandleNonInstallCmdLineOptions(const InstallerState& installer_state, installer::switches::kChromeFrameReadyModeOptIn)) { *exit_code = InstallUtil::GetInstallReturnCode( installer::ChromeFrameReadyModeOptIn(installer_state, cmd_line)); + } else if (cmd_line.HasSwitch( + installer::switches::kChromeFrameReadyModeTempOptOut)) { + *exit_code = InstallUtil::GetInstallReturnCode( + installer::ChromeFrameReadyModeTempOptOut(cmd_line)); + } else if (cmd_line.HasSwitch( + installer::switches::kChromeFrameReadyModeEndTempOptOut)) { + *exit_code = InstallUtil::GetInstallReturnCode( + installer::ChromeFrameReadyModeEndTempOptOut(cmd_line)); } else { handled = false; } |