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

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

Issue 115993006: Revert of Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/logging_installer.cc ('k') | chrome/installer/util/master_preferences.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 // 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 bool install_chrome() const { 167 bool install_chrome() const {
168 return chrome_; 168 return chrome_;
169 } 169 }
170 170
171 bool install_chrome_app_launcher() const { 171 bool install_chrome_app_launcher() const {
172 return chrome_app_launcher_; 172 return chrome_app_launcher_;
173 } 173 }
174 174
175 bool install_chrome_frame() const {
176 return chrome_frame_;
177 }
178
175 bool is_multi_install() const { 179 bool is_multi_install() const {
176 return multi_install_; 180 return multi_install_;
177 } 181 }
178 182
179 // Returns a reference to this MasterPreferences' root dictionary of values. 183 // Returns a reference to this MasterPreferences' root dictionary of values.
180 const base::DictionaryValue& master_dictionary() const { 184 const base::DictionaryValue& master_dictionary() const {
181 return *master_dictionary_.get(); 185 return *master_dictionary_.get();
182 } 186 }
183 187
184 // Returns a static preference object that has been initialized with the 188 // Returns a static preference object that has been initialized with the
(...skipping 14 matching lines...) Expand all
199 // Enforces legacy preferences that should no longer be used, but could be 203 // Enforces legacy preferences that should no longer be used, but could be
200 // found in older master_preferences files. 204 // found in older master_preferences files.
201 void EnforceLegacyPreferences(); 205 void EnforceLegacyPreferences();
202 206
203 protected: 207 protected:
204 scoped_ptr<base::DictionaryValue> master_dictionary_; 208 scoped_ptr<base::DictionaryValue> master_dictionary_;
205 base::DictionaryValue* distribution_; 209 base::DictionaryValue* distribution_;
206 bool preferences_read_from_file_; 210 bool preferences_read_from_file_;
207 bool chrome_; 211 bool chrome_;
208 bool chrome_app_launcher_; 212 bool chrome_app_launcher_;
213 bool chrome_frame_;
209 bool multi_install_; 214 bool multi_install_;
210 215
211 private: 216 private:
212 DISALLOW_COPY_AND_ASSIGN(MasterPreferences); 217 DISALLOW_COPY_AND_ASSIGN(MasterPreferences);
213 }; 218 };
214 219
215 } // namespace installer 220 } // namespace installer
216 221
217 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_ 222 #endif // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/logging_installer.cc ('k') | chrome/installer/util/master_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698