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

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

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_INSTALLATION_STATE_H_ 5 #ifndef CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
6 #define CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_ 6 #define CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ProductState& CopyFrom(const ProductState& other); 95 ProductState& CopyFrom(const ProductState& other);
96 96
97 // Clears the state of this object. 97 // Clears the state of this object.
98 void Clear(); 98 void Clear();
99 99
100 protected: 100 protected:
101 static bool InitializeCommands(const base::win::RegKey& version_key, 101 static bool InitializeCommands(const base::win::RegKey& version_key,
102 AppCommands* commands); 102 AppCommands* commands);
103 103
104 ChannelInfo channel_; 104 ChannelInfo channel_;
105 scoped_ptr<base::Version> version_; 105 scoped_ptr<Version> version_;
106 scoped_ptr<base::Version> old_version_; 106 scoped_ptr<Version> old_version_;
107 std::wstring brand_; 107 std::wstring brand_;
108 std::wstring rename_cmd_; 108 std::wstring rename_cmd_;
109 std::wstring oem_install_; 109 std::wstring oem_install_;
110 CommandLine uninstall_command_; 110 CommandLine uninstall_command_;
111 AppCommands commands_; 111 AppCommands commands_;
112 DWORD eula_accepted_; 112 DWORD eula_accepted_;
113 DWORD usagestats_; 113 DWORD usagestats_;
114 bool msi_ : 1; 114 bool msi_ : 1;
115 bool multi_install_ : 1; 115 bool multi_install_ : 1;
116 bool has_eula_accepted_ : 1; 116 bool has_eula_accepted_ : 1;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 ProductState user_products_[NUM_PRODUCTS]; 161 ProductState user_products_[NUM_PRODUCTS];
162 ProductState system_products_[NUM_PRODUCTS]; 162 ProductState system_products_[NUM_PRODUCTS];
163 163
164 private: 164 private:
165 DISALLOW_COPY_AND_ASSIGN(InstallationState); 165 DISALLOW_COPY_AND_ASSIGN(InstallationState);
166 }; // class InstallationState 166 }; // class InstallationState
167 167
168 } // namespace installer 168 } // namespace installer
169 169
170 #endif // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_ 170 #endif // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698