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/browser/chromeos/login/version_info_updater.h" | 5 #include "chrome/browser/chromeos/login/version_info_updater.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 } | 149 } |
150 | 150 |
151 void VersionInfoUpdater::OnVersion(const std::string& version) { | 151 void VersionInfoUpdater::OnVersion(const std::string& version) { |
152 version_text_ = version; | 152 version_text_ = version; |
153 UpdateVersionLabel(); | 153 UpdateVersionLabel(); |
154 } | 154 } |
155 | 155 |
156 void VersionInfoUpdater::OnBootTimesNoop( | 156 void VersionInfoUpdater::OnBootTimesNoop( |
157 const BootTimesLoader::BootTimes& boot_times) {} | 157 const BootTimesLoader::BootTimes& boot_times) {} |
158 | 158 |
| 159 // Mask it out for ASAN before the bug is fixed, see crbug.com/170034 |
| 160 #if defined(ADDRESS_SANITIZER) |
| 161 __attribute__((no_address_safety_analysis)) |
| 162 #endif // defined(ADDRESS_SANITIZER) |
159 void VersionInfoUpdater::OnBootTimes( | 163 void VersionInfoUpdater::OnBootTimes( |
160 const BootTimesLoader::BootTimes& boot_times) { | 164 const BootTimesLoader::BootTimes& boot_times) { |
161 const char* kBootTimesNoChromeExec = | 165 const char* kBootTimesNoChromeExec = |
162 "Non-firmware boot took %.2f seconds (kernel %.2fs, system %.2fs)"; | 166 "Non-firmware boot took %.2f seconds (kernel %.2fs, system %.2fs)"; |
163 const char* kBootTimesChromeExec = | 167 const char* kBootTimesChromeExec = |
164 "Non-firmware boot took %.2f seconds " | 168 "Non-firmware boot took %.2f seconds " |
165 "(kernel %.2fs, system %.2fs, chrome %.2fs)"; | 169 "(kernel %.2fs, system %.2fs, chrome %.2fs)"; |
166 std::string boot_times_text; | 170 std::string boot_times_text; |
167 | 171 |
168 if (boot_times.chrome > 0) { | 172 if (boot_times.chrome > 0) { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 int type, | 208 int type, |
205 const content::NotificationSource& source, | 209 const content::NotificationSource& source, |
206 const content::NotificationDetails& details) { | 210 const content::NotificationDetails& details) { |
207 if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED) | 211 if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED) |
208 UpdateEnterpriseInfo(); | 212 UpdateEnterpriseInfo(); |
209 else | 213 else |
210 NOTREACHED(); | 214 NOTREACHED(); |
211 } | 215 } |
212 | 216 |
213 } // namespace chromeos | 217 } // namespace chromeos |
OLD | NEW |