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

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

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. Created 4 years, 8 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
« no previous file with comments | « chrome/installer/util/install_util_unittest.cc ('k') | chrome/installer/util/installer_state.h » ('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 <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "chrome/installer/util/app_commands.h" 14 #include "chrome/installer/util/app_commands.h"
15 #include "chrome/installer/util/browser_distribution.h" 15 #include "chrome/installer/util/browser_distribution.h"
16 #include "chrome/installer/util/channel_info.h" 16 #include "chrome/installer/util/channel_info.h"
17 17
18 namespace base { 18 namespace base {
19 class Version; 19 class Version;
20 namespace win { 20 namespace win {
21 class RegKey; 21 class RegKey;
22 } 22 }
23 } 23 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 ProductState& CopyFrom(const ProductState& other); 98 ProductState& CopyFrom(const ProductState& other);
99 99
100 // Clears the state of this object. 100 // Clears the state of this object.
101 void Clear(); 101 void Clear();
102 102
103 protected: 103 protected:
104 static bool InitializeCommands(const base::win::RegKey& version_key, 104 static bool InitializeCommands(const base::win::RegKey& version_key,
105 AppCommands* commands); 105 AppCommands* commands);
106 106
107 ChannelInfo channel_; 107 ChannelInfo channel_;
108 scoped_ptr<Version> version_; 108 std::unique_ptr<Version> version_;
109 scoped_ptr<Version> old_version_; 109 std::unique_ptr<Version> old_version_;
110 std::wstring brand_; 110 std::wstring brand_;
111 std::wstring rename_cmd_; 111 std::wstring rename_cmd_;
112 std::wstring oem_install_; 112 std::wstring oem_install_;
113 base::CommandLine uninstall_command_; 113 base::CommandLine uninstall_command_;
114 AppCommands commands_; 114 AppCommands commands_;
115 DWORD eula_accepted_; 115 DWORD eula_accepted_;
116 DWORD usagestats_; 116 DWORD usagestats_;
117 bool msi_ : 1; 117 bool msi_ : 1;
118 bool multi_install_ : 1; 118 bool multi_install_ : 1;
119 bool has_eula_accepted_ : 1; 119 bool has_eula_accepted_ : 1;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 ProductState user_products_[NUM_PRODUCTS]; 163 ProductState user_products_[NUM_PRODUCTS];
164 ProductState system_products_[NUM_PRODUCTS]; 164 ProductState system_products_[NUM_PRODUCTS];
165 165
166 private: 166 private:
167 DISALLOW_COPY_AND_ASSIGN(InstallationState); 167 DISALLOW_COPY_AND_ASSIGN(InstallationState);
168 }; // class InstallationState 168 }; // class InstallationState
169 169
170 } // namespace installer 170 } // namespace installer
171 171
172 #endif // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_ 172 #endif // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/install_util_unittest.cc ('k') | chrome/installer/util/installer_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698