| 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1296 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 1296 #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 1297 | 1297 |
| 1298 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 1298 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
| 1299 // Set the product channel for crash reports. | 1299 // Set the product channel for crash reports. |
| 1300 base::debug::SetCrashKeyValue(crash_keys::kChannel, | 1300 base::debug::SetCrashKeyValue(crash_keys::kChannel, |
| 1301 chrome::GetChannelString()); | 1301 chrome::GetChannelString()); |
| 1302 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) | 1302 #endif // defined(OS_LINUX) || defined(OS_OPENBSD) |
| 1303 | 1303 |
| 1304 // Initialize tracking synchronizer system. | 1304 // Initialize tracking synchronizer system. |
| 1305 tracking_synchronizer_ = new metrics::TrackingSynchronizer( | 1305 tracking_synchronizer_ = new metrics::TrackingSynchronizer( |
| 1306 base::WrapUnique(new base::DefaultTickClock()), | 1306 base::MakeUnique<base::DefaultTickClock>(), |
| 1307 base::Bind(&metrics::ContentTrackingSynchronizerDelegate::Create)); | 1307 base::Bind(&metrics::ContentTrackingSynchronizerDelegate::Create)); |
| 1308 | 1308 |
| 1309 #if defined(OS_MACOSX) | 1309 #if defined(OS_MACOSX) |
| 1310 // Get the Keychain API to register for distributed notifications on the main | 1310 // Get the Keychain API to register for distributed notifications on the main |
| 1311 // thread, which has a proper CFRunloop, instead of later on the I/O thread, | 1311 // thread, which has a proper CFRunloop, instead of later on the I/O thread, |
| 1312 // which doesn't. This ensures those notifications will get delivered | 1312 // which doesn't. This ensures those notifications will get delivered |
| 1313 // properly. See issue 37766. | 1313 // properly. See issue 37766. |
| 1314 // (Note that the callback mask here is empty. I don't want to register for | 1314 // (Note that the callback mask here is empty. I don't want to register for |
| 1315 // any callbacks, I just want to initialize the mechanism.) | 1315 // any callbacks, I just want to initialize the mechanism.) |
| 1316 SecKeychainAddCallback(&KeychainCallback, 0, NULL); | 1316 SecKeychainAddCallback(&KeychainCallback, 0, NULL); |
| (...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2207 chromeos::CrosSettings::Shutdown(); | 2207 chromeos::CrosSettings::Shutdown(); |
| 2208 #endif // defined(OS_CHROMEOS) | 2208 #endif // defined(OS_CHROMEOS) |
| 2209 #endif // defined(OS_ANDROID) | 2209 #endif // defined(OS_ANDROID) |
| 2210 } | 2210 } |
| 2211 | 2211 |
| 2212 // Public members: | 2212 // Public members: |
| 2213 | 2213 |
| 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2215 chrome_extra_parts_.push_back(parts); | 2215 chrome_extra_parts_.push_back(parts); |
| 2216 } | 2216 } |
| OLD | NEW |