Remove Chrome Frame quick-enable.

BUG=316496 NOTRY=true Review URL: https://codereview.chromium.org/103253004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241116 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Dec 17, 2013 · 194b074 · 194b074
1 parent 4f4167c
commit 194b074
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 510 deletions.
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
@@ -275,8 +275,6 @@
             'installer/setup/archive_patch_helper.h',
             'installer/setup/cf_migration.cc',
             'installer/setup/cf_migration.h',
-            'installer/setup/chrome_frame_quick_enable.cc',
-            'installer/setup/chrome_frame_quick_enable.h',
             'installer/setup/install.cc',
             'installer/setup/install.h',
             'installer/setup/install_worker.cc',

diff --git a/chrome/installer/setup/chrome_frame_quick_enable.cc b/chrome/installer/setup/chrome_frame_quick_enable.cc
diff --git a/chrome/installer/setup/chrome_frame_quick_enable.h b/chrome/installer/setup/chrome_frame_quick_enable.h
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
@@ -393,8 +393,7 @@ void AddProductSpecificWorkItems(const InstallationState& original_state,
     if (p.is_chrome_binaries()) {
       AddQueryEULAAcceptanceWorkItems(
           installer_state, setup_path, new_version, p, list);
-      AddQuickEnableChromeFrameWorkItems(
-          installer_state, original_state, setup_path, new_version, list);
+      AddQuickEnableChromeFrameWorkItems(installer_state, list);
       AddQuickEnableApplicationLauncherWorkItems(
           installer_state, original_state, setup_path, new_version, list);
     }
@@ -1512,50 +1511,21 @@ void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
 }
 
 void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
-                                        const InstallationState& machine_state,
-                                        const base::FilePath& setup_path,
-                                        const Version& new_version,
                                         WorkItemList* work_item_list) {
   DCHECK(work_item_list);
 
-  const bool system_install = installer_state.system_install();
-  bool will_have_chrome_frame =
-      WillProductBePresentAfterSetup(installer_state, machine_state,
-                                     BrowserDistribution::CHROME_FRAME);
-  bool will_have_chrome_binaries =
-      WillProductBePresentAfterSetup(installer_state, machine_state,
-                                     BrowserDistribution::CHROME_BINARIES);
-
   string16 cmd_key(GetRegCommandKey(
                        BrowserDistribution::GetSpecificDistribution(
                            BrowserDistribution::CHROME_BINARIES),
                        kCmdQuickEnableCf));
 
-  if (will_have_chrome_frame) {
-    // Chrome Frame is (to be) installed. Unconditionally remove the Quick
-    // Enable command from the binaries. We do this even if multi-install Chrome
-    // isn't installed since we don't want them left behind in any case.
-    work_item_list->AddDeleteRegKeyWorkItem(
-        installer_state.root_key(), cmd_key)->set_log_message(
-            "removing " + WideToASCII(kCmdQuickEnableCf) + " command");
+  // Unconditionally remove the legacy Quick Enable command from the binaries.
+  // Do this even if multi-install Chrome isn't installed to ensure that it is
+  // not left behind in any case.
+  work_item_list->AddDeleteRegKeyWorkItem(
+      installer_state.root_key(), cmd_key)->set_log_message(
+          "removing " + WideToASCII(kCmdQuickEnableCf) + " command");
 
-  } else if (will_have_chrome_binaries) {
-    // Chrome Frame isn't (to be) installed while some other multi-install
-    // product is (to be) installed. Add the Quick Enable command to
-    // the binaries.
-    CommandLine cmd_line(GetGenericQuickEnableCommand(installer_state,
-                                                      machine_state,
-                                                      setup_path,
-                                                      new_version));
-    // kMultiInstall and kVerboseLogging were processed above.
-    cmd_line.AppendSwitch(switches::kChromeFrameQuickEnable);
-    if (installer_state.system_install())
-      cmd_line.AppendSwitch(switches::kSystemLevel);
-    AppCommand cmd(cmd_line.GetCommandLineString());
-    cmd.set_sends_pings(true);
-    cmd.set_is_web_accessible(true);
-    cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list);
-  }
 }
 
 }  // namespace installer
diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h
@@ -190,17 +190,9 @@ void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
                                      const Product& product,
                                      WorkItemList* work_item_list);
 
-// Adds work items to add or remove the "quick-enable-cf" to the multi-installer
-// binaries' version key on the basis of the current operation (represented in
-// |installer_state|) and the pre-existing machine configuration (represented in
-// |machine_state|).  |setup_path| (the path to the executable currently being
-// run) and |new_version| (the version of the product(s) currently being
-// installed) are required when processing product installation; they are unused
-// (and may therefore be empty) when uninstalling.
+// Adds work items to remove "quick-enable-cf" from the multi-installer
+// binaries' version key.
 void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
-                                        const InstallationState& machine_state,
-                                        const base::FilePath& setup_path,
-                                        const base::Version& new_version,
                                         WorkItemList* work_item_list);
 
 }  // namespace installer