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

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

Issue 12316097: Added master_preferences to control shortcuts on windows. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: split into 2 prefs Created 7 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
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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // Initializes the instance from a given JSON string, returning true if the 192 // Initializes the instance from a given JSON string, returning true if the
193 // string was successfully parsed. 193 // string was successfully parsed.
194 bool InitializeFromString(const std::string& json_data); 194 bool InitializeFromString(const std::string& json_data);
195 195
196 void InitializeProductFlags(); 196 void InitializeProductFlags();
197 197
198 // Enforces legacy preferences that should no longer be used, but could be 198 // Enforces legacy preferences that should no longer be used, but could be
199 // found in older master_preferences files. 199 // found in older master_preferences files.
200 void EnforceLegacyPreferences(); 200 void EnforceLegacyPreferences();
201 201
202 // Enforces the shorcut preferences, making sure that they don't overlap.
203 void EnforceShorcutPreferences();
204
202 protected: 205 protected:
203 scoped_ptr<base::DictionaryValue> master_dictionary_; 206 scoped_ptr<base::DictionaryValue> master_dictionary_;
204 base::DictionaryValue* distribution_; 207 base::DictionaryValue* distribution_;
205 bool preferences_read_from_file_; 208 bool preferences_read_from_file_;
206 bool chrome_; 209 bool chrome_;
207 bool chrome_app_launcher_; 210 bool chrome_app_launcher_;
208 bool chrome_frame_; 211 bool chrome_frame_;
209 bool multi_install_; 212 bool multi_install_;
210 213
211 private: 214 private:
212 DISALLOW_COPY_AND_ASSIGN(MasterPreferences); 215 DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
213 }; 216 };
214 217
215 } // namespace installer 218 } // namespace installer
216 219
217 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 220 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698