OLD | NEW |
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 #include "chrome/installer/util/chrome_frame_operations.h" | 5 #include "chrome/installer/util/chrome_frame_operations.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" |
10 #include "chrome/installer/util/channel_info.h" | 11 #include "chrome/installer/util/channel_info.h" |
11 #include "chrome/installer/util/helper.h" | 12 #include "chrome/installer/util/helper.h" |
12 #include "chrome/installer/util/master_preferences.h" | 13 #include "chrome/installer/util/master_preferences.h" |
13 #include "chrome/installer/util/master_preferences_constants.h" | 14 #include "chrome/installer/util/master_preferences_constants.h" |
14 #include "chrome/installer/util/util_constants.h" | 15 #include "chrome/installer/util/util_constants.h" |
15 | 16 |
16 namespace installer { | 17 namespace installer { |
17 | 18 |
18 void ChromeFrameOperations::ReadOptions(const MasterPreferences& prefs, | 19 void ChromeFrameOperations::ReadOptions(const MasterPreferences& prefs, |
19 std::set<base::string16>* options) | 20 std::set<base::string16>* options) |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 const base::FilePath& setup_path, | 133 const base::FilePath& setup_path, |
133 const std::set<base::string16>& options, | 134 const std::set<base::string16>& options, |
134 InstallStatus status, | 135 InstallStatus status, |
135 bool system_level) const { | 136 bool system_level) const { |
136 // No experiments yet. If adding some in the future, need to have | 137 // No experiments yet. If adding some in the future, need to have |
137 // ChromeFrameDistribution::HasUserExperiments() return true. | 138 // ChromeFrameDistribution::HasUserExperiments() return true. |
138 NOTREACHED(); | 139 NOTREACHED(); |
139 } | 140 } |
140 | 141 |
141 } // namespace installer | 142 } // namespace installer |
OLD | NEW |