Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: chrome/installer/util/installer_state.h

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "base/version.h" 17 #include "base/version.h"
18 #include "chrome/installer/util/browser_distribution.h" 18 #include "chrome/installer/util/browser_distribution.h"
19 #include "chrome/installer/util/product.h" 19 #include "chrome/installer/util/product.h"
20 #include "chrome/installer/util/util_constants.h" 20 #include "chrome/installer/util/util_constants.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include <windows.h> // NOLINT 23 #include <windows.h> // NOLINT
24 #endif 24 #endif
25 25
26 namespace base {
26 class CommandLine; 27 class CommandLine;
28 }
27 29
28 namespace installer { 30 namespace installer {
29 31
30 class ChannelInfo; 32 class ChannelInfo;
31 class InstallationState; 33 class InstallationState;
32 class MasterPreferences; 34 class MasterPreferences;
33 35
34 class ProductState; 36 class ProductState;
35 37
36 typedef std::vector<Product*> Products; 38 typedef std::vector<Product*> Products;
(...skipping 29 matching lines...) Expand all
66 UNINSTALL 68 UNINSTALL
67 }; 69 };
68 70
69 // Constructs an uninitialized instance; see Initialize(). 71 // Constructs an uninitialized instance; see Initialize().
70 InstallerState(); 72 InstallerState();
71 73
72 // Constructs an initialized but empty instance. 74 // Constructs an initialized but empty instance.
73 explicit InstallerState(Level level); 75 explicit InstallerState(Level level);
74 76
75 // Initializes this object based on the current operation. 77 // Initializes this object based on the current operation.
76 void Initialize(const CommandLine& command_line, 78 void Initialize(const base::CommandLine& command_line,
77 const MasterPreferences& prefs, 79 const MasterPreferences& prefs,
78 const InstallationState& machine_state); 80 const InstallationState& machine_state);
79 81
80 // Adds a product constructed on the basis of |state|, setting this object's 82 // 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, 83 // 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 84 // or NULL if |state| is incompatible with this object. Ownership is not
83 // passed to the caller. 85 // passed to the caller.
84 Product* AddProductFromState(BrowserDistribution::Type type, 86 Product* AddProductFromState(BrowserDistribution::Type type,
85 const ProductState& state); 87 const ProductState& state);
86 88
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 bool verbose_logging_; 276 bool verbose_logging_;
275 bool ensure_google_update_present_; 277 bool ensure_google_update_present_;
276 278
277 private: 279 private:
278 DISALLOW_COPY_AND_ASSIGN(InstallerState); 280 DISALLOW_COPY_AND_ASSIGN(InstallerState);
279 }; // class InstallerState 281 }; // class InstallerState
280 282
281 } // namespace installer 283 } // namespace installer
282 284
283 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_ 285 #endif // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/installation_validator.h ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698