Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3063)

Unified Diff: chrome/installer/setup/setup_util.cc

Issue 117433002: Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo fix Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/setup_util.h ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_util.cc
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index b7422a2ec784a6bea1ac6487f061c2b6b5325be9..d21abf97bd2346c222e2da73cc2d007b6fd668c8 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -429,6 +429,26 @@ bool IsUninstallSuccess(InstallStatus install_status) {
install_status == UNINSTALL_REQUIRES_REBOOT);
}
+bool ContainsUnsupportedSwitch(const CommandLine& cmd_line) {
+ static const char* const kLegacySwitches[] = {
+ // Chrome Frame ready-mode.
+ "ready-mode",
+ "ready-mode-opt-in",
+ "ready-mode-temp-opt-out",
+ "ready-mode-end-temp-opt-out",
+ // Chrome Frame quick-enable.
+ "quick-enable-cf",
+ // Installation of Chrome Frame.
+ "chrome-frame",
+ "migrate-chrome-frame",
+ };
+ for (size_t i = 0; i < arraysize(kLegacySwitches); ++i) {
+ if (cmd_line.HasSwitch(kLegacySwitches[i]))
+ return true;
+ }
+ return false;
+}
+
ScopedTokenPrivilege::ScopedTokenPrivilege(const wchar_t* privilege_name)
: is_enabled_(false) {
HANDLE temp_handle;
« no previous file with comments | « chrome/installer/setup/setup_util.h ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698