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

Unified Diff: ios/web/public/user_agent.mm

Issue 1544743002: Switch to standard integer types in ios/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « ios/web/public/test/test_web_state.cc ('k') | ios/web/public/web_state/global_web_state_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/public/user_agent.mm
diff --git a/ios/web/public/user_agent.mm b/ios/web/public/user_agent.mm
index d930fb78e7e8a09634b1e144c1950b407a9c76b4..722c25eb7049bfc890e85cab492423612f42008a 100644
--- a/ios/web/public/user_agent.mm
+++ b/ios/web/public/user_agent.mm
@@ -6,10 +6,13 @@
#import <UIKit/UIKit.h>
+#include <stddef.h>
+#include <stdint.h>
#include <sys/sysctl.h>
#include <string>
#include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
@@ -23,8 +26,8 @@ struct UAVersions {
};
struct OSVersionMap {
- int32 major_os_version;
- int32 minor_os_version;
+ int32_t major_os_version;
+ int32_t minor_os_version;
UAVersions ua_versions;
};
@@ -39,9 +42,9 @@ const UAVersions& GetUAVersionsForCurrentOS() {
{7, 0, {"9537.53", "537.51.1"}},
};
- int32 os_major_version = 0;
- int32 os_minor_version = 0;
- int32 os_bugfix_version = 0;
+ int32_t os_major_version = 0;
+ int32_t os_minor_version = 0;
+ int32_t os_bugfix_version = 0;
base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
&os_minor_version,
&os_bugfix_version);
@@ -63,9 +66,9 @@ const UAVersions& GetUAVersionsForCurrentOS() {
namespace web {
std::string BuildOSCpuInfo() {
- int32 os_major_version = 0;
- int32 os_minor_version = 0;
- int32 os_bugfix_version = 0;
+ int32_t os_major_version = 0;
+ int32_t os_minor_version = 0;
+ int32_t os_bugfix_version = 0;
base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
&os_minor_version,
&os_bugfix_version);
« no previous file with comments | « ios/web/public/test/test_web_state.cc ('k') | ios/web/public/web_state/global_web_state_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698