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

Unified Diff: base/ios/device_util.mm

Issue 349453002: Remove IsRunningOnIOS6OrLater (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/ios/device_util_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/ios/device_util.mm
diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm
index c345e5e316da91bee4a101ed8788298a1927ed01..ff7be36875cb342a162b97675cb4102d51f77e99 100644
--- a/base/ios/device_util.mm
+++ b/base/ios/device_util.mm
@@ -44,13 +44,9 @@ NSString* GenerateClientId() {
// http://openradar.appspot.com/12377282. If this is the case, revert to
// generating a new one.
if (!client_id || [client_id isEqualToString:kZeroUUID]) {
- if (base::ios::IsRunningOnIOS6OrLater()) {
- client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
- if ([client_id isEqualToString:kZeroUUID])
- client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId());
- } else {
+ client_id = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
+ if ([client_id isEqualToString:kZeroUUID])
client_id = base::SysUTF8ToNSString(ios::device_util::GetRandomId());
- }
}
return client_id;
}
« no previous file with comments | « no previous file | base/ios/device_util_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698