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

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

Issue 2589753002: Remove multi-install from chrome/installer/setup. (Closed)
Patch Set: gab and robertshield comments Created 3 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
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 // This file contains functions processing master preference file used by 5 // This file contains functions processing master preference file used by
6 // setup and first run. 6 // setup and first run.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 8 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
9 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 9 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 std::string GetVariationsSeed() const; 163 std::string GetVariationsSeed() const;
164 164
165 // Returns the variations seed signature entry from the master prefs. 165 // Returns the variations seed signature entry from the master prefs.
166 std::string GetVariationsSeedSignature() const; 166 std::string GetVariationsSeedSignature() const;
167 167
168 // Returns true iff the master preferences were successfully read from a file. 168 // Returns true iff the master preferences were successfully read from a file.
169 bool read_from_file() const { 169 bool read_from_file() const {
170 return preferences_read_from_file_; 170 return preferences_read_from_file_;
171 } 171 }
172 172
173 bool install_chrome() const { return true; }
174
175 bool is_multi_install() const { return false; } 173 bool is_multi_install() const { return false; }
176 174
177 // Returns a reference to this MasterPreferences' root dictionary of values. 175 // Returns a reference to this MasterPreferences' root dictionary of values.
178 const base::DictionaryValue& master_dictionary() const { 176 const base::DictionaryValue& master_dictionary() const {
179 return *master_dictionary_.get(); 177 return *master_dictionary_.get();
180 } 178 }
181 179
182 // Returns a static preference object that has been initialized with the 180 // Returns a static preference object that has been initialized with the
183 // CommandLine object for the current process. 181 // CommandLine object for the current process.
184 // NOTE: Must not be called before CommandLine::Init() is called! 182 // NOTE: Must not be called before CommandLine::Init() is called!
(...skipping 21 matching lines...) Expand all
206 base::DictionaryValue* distribution_ = nullptr; 204 base::DictionaryValue* distribution_ = nullptr;
207 bool preferences_read_from_file_ = false; 205 bool preferences_read_from_file_ = false;
208 206
209 private: 207 private:
210 DISALLOW_COPY_AND_ASSIGN(MasterPreferences); 208 DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
211 }; 209 };
212 210
213 } // namespace installer 211 } // namespace installer
214 212
215 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 213 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698