diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 14:23:31 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 14:23:31 +0000 |
| commit | f9e610c796244fe1d504bef5ddda8ce07e590b1c (patch) | |
| tree | fc9696d7e3b62da0a152cd8d051fed0e8294edbf /chrome/installer/util | |
| parent | c031aeda4ec93a6939cd8ed9f2273fb4279238ac (diff) | |
| download | chromium_src-f9e610c796244fe1d504bef5ddda8ce07e590b1c.zip chromium_src-f9e610c796244fe1d504bef5ddda8ce07e590b1c.tar.gz chromium_src-f9e610c796244fe1d504bef5ddda8ce07e590b1c.tar.bz2 | |
Fix a SelfRegWorkItem bug that causes it to ignore the ignore_failures_ flag.
BUG=68877
TEST=Installing Chrome with --multi and then Chrome Frame with --multi works.
Review URL: http://codereview.chromium.org/6109006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/self_reg_work_item.h | 5 | ||||
| -rw-r--r-- | chrome/installer/util/work_item.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/installer/util/self_reg_work_item.h b/chrome/installer/util/self_reg_work_item.h index fa4adde..cc12ca9 100644 --- a/chrome/installer/util/self_reg_work_item.h +++ b/chrome/installer/util/self_reg_work_item.h @@ -49,11 +49,6 @@ class SelfRegWorkItem : public WorkItem { // Whether to use alternate export names on the DLL that will perform // user level registration. bool user_level_registration_; - - // Specifies whether this work item my fail to complete and yet still - // return true from Do(). Use this when making a best effort at unregistering - // old Dlls. - bool ignore_failure_; }; #endif // CHROME_INSTALLER_UTIL_SELF_REG_WORK_ITEM_H__ diff --git a/chrome/installer/util/work_item.h b/chrome/installer/util/work_item.h index a03f5f46..6b1d463 100644 --- a/chrome/installer/util/work_item.h +++ b/chrome/installer/util/work_item.h @@ -163,7 +163,10 @@ class WorkItem { protected: WorkItem(); + // Specifies whether this work item my fail to complete and yet still + // return true from Do(). bool ignore_failure_; + std::string log_message_; }; |