Index: update_attempter.cc |
diff --git a/update_attempter.cc b/update_attempter.cc |
index f788ac8f78ef88a7f9bce53c33f7efa7528210ec..a108001d7fb7892d9e9197234c349dd01ea7bd1b 100644 |
--- a/update_attempter.cc |
+++ b/update_attempter.cc |
@@ -27,7 +27,6 @@ |
#include "update_engine/omaha_response_handler_action.h" |
#include "update_engine/postinstall_runner_action.h" |
#include "update_engine/prefs_interface.h" |
-#include "update_engine/set_bootable_flag_action.h" |
#include "update_engine/update_check_scheduler.h" |
using base::TimeDelta; |
@@ -85,8 +84,6 @@ ActionExitCode GetErrorCodeForAction(AbstractAction* action, |
return kActionCodeFilesystemCopierError; |
if (type == PostinstallRunnerAction::StaticType()) |
return kActionCodePostinstallRunnerError; |
- if (type == SetBootableFlagAction::StaticType()) |
- return kActionCodeSetBootableFlagError; |
return code; |
} |
@@ -164,8 +161,6 @@ void UpdateAttempter::Update(const std::string& app_version, |
new LibcurlHttpFetcher)); |
shared_ptr<PostinstallRunnerAction> postinstall_runner_action_precommit( |
new PostinstallRunnerAction(true)); |
- shared_ptr<SetBootableFlagAction> set_bootable_flag_action( |
- new SetBootableFlagAction); |
shared_ptr<PostinstallRunnerAction> postinstall_runner_action_postcommit( |
adlr
2010/11/08 22:54:07
you may want to delete this now? or is this in a s
petkov
2010/11/08 22:56:53
I thought it's going to be cleaner in a separate C
|
new PostinstallRunnerAction(false)); |
shared_ptr<OmahaRequestAction> update_complete_action( |
@@ -188,7 +183,6 @@ void UpdateAttempter::Update(const std::string& app_version, |
actions_.push_back(shared_ptr<AbstractAction>(download_finished_action)); |
actions_.push_back(shared_ptr<AbstractAction>( |
postinstall_runner_action_precommit)); |
- actions_.push_back(shared_ptr<AbstractAction>(set_bootable_flag_action)); |
actions_.push_back(shared_ptr<AbstractAction>( |
postinstall_runner_action_postcommit)); |
actions_.push_back(shared_ptr<AbstractAction>(update_complete_action)); |
@@ -212,8 +206,6 @@ void UpdateAttempter::Update(const std::string& app_version, |
BondActions(download_action.get(), |
postinstall_runner_action_precommit.get()); |
BondActions(postinstall_runner_action_precommit.get(), |
- set_bootable_flag_action.get()); |
- BondActions(set_bootable_flag_action.get(), |
postinstall_runner_action_postcommit.get()); |
SetStatusAndNotify(UPDATE_STATUS_CHECKING_FOR_UPDATE); |