OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ | 5 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ |
6 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ | 6 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 UNINSTALL | 66 UNINSTALL |
67 }; | 67 }; |
68 | 68 |
69 // Constructs an uninitialized instance; see Initialize(). | 69 // Constructs an uninitialized instance; see Initialize(). |
70 InstallerState(); | 70 InstallerState(); |
71 | 71 |
72 // Constructs an initialized but empty instance. | 72 // Constructs an initialized but empty instance. |
73 explicit InstallerState(Level level); | 73 explicit InstallerState(Level level); |
74 | 74 |
75 // Initializes this object based on the current operation. | 75 // Initializes this object based on the current operation. |
76 void Initialize(const CommandLine& command_line, | 76 // Returns false iff conflicting options are found. |
| 77 bool Initialize(const CommandLine& command_line, |
77 const MasterPreferences& prefs, | 78 const MasterPreferences& prefs, |
78 const InstallationState& machine_state); | 79 const InstallationState& machine_state); |
79 | 80 |
80 // Adds a product constructed on the basis of |state|, setting this object's | 81 // Adds a product constructed on the basis of |state|, setting this object's |
81 // msi flag if |state| is msi-installed. Returns the product that was added, | 82 // msi flag if |state| is msi-installed. Returns the product that was added, |
82 // or NULL if |state| is incompatible with this object. Ownership is not | 83 // or NULL if |state| is incompatible with this object. Ownership is not |
83 // passed to the caller. | 84 // passed to the caller. |
84 Product* AddProductFromState(BrowserDistribution::Type type, | 85 Product* AddProductFromState(BrowserDistribution::Type type, |
85 const ProductState& state); | 86 const ProductState& state); |
86 | 87 |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 bool verbose_logging_; | 242 bool verbose_logging_; |
242 bool ensure_google_update_present_; | 243 bool ensure_google_update_present_; |
243 | 244 |
244 private: | 245 private: |
245 DISALLOW_COPY_AND_ASSIGN(InstallerState); | 246 DISALLOW_COPY_AND_ASSIGN(InstallerState); |
246 }; // class InstallerState | 247 }; // class InstallerState |
247 | 248 |
248 } // namespace installer | 249 } // namespace installer |
249 | 250 |
250 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ | 251 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ |
OLD | NEW |