| Index: chrome/installer/util/installer_state.h
|
| diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h
|
| index e6636dbfcbbee7d8db9b83d8d38c8ada52c5e17e..2a030f26d48155afc3d3e358a54b7f4470665466 100644
|
| --- a/chrome/installer/util/installer_state.h
|
| +++ b/chrome/installer/util/installer_state.h
|
| @@ -73,7 +73,8 @@ class InstallerState {
|
| explicit InstallerState(Level level);
|
|
|
| // Initializes this object based on the current operation.
|
| - void Initialize(const CommandLine& command_line,
|
| + // Returns false iff conflicting options are found.
|
| + bool Initialize(const CommandLine& command_line,
|
| const MasterPreferences& prefs,
|
| const InstallationState& machine_state);
|
|
|
|
|