chrome/browser/policy/device_management_service_configuration.cc - Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/device_management_service_configuration.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (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 | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/policy/file_selection_dialogs_policy_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/device_management_service_configuration.cc

diff --git a/chrome/browser/policy/device_management_service_configuration.cc b/chrome/browser/policy/device_management_service_configuration.cc

index a47805e8bb870ca96f9cf4ca1d81dd023213df3c..1b8200b093c528c2b6f11204071fff722b9e3455 100644

--- a/chrome/browser/policy/device_management_service_configuration.cc

+++ b/chrome/browser/policy/device_management_service_configuration.cc

@@ -4,10 +4,12 @@

#include "chrome/browser/policy/device_management_service_configuration.h"

-#include "base/basictypes.h"

+#include <stdint.h>

#include "base/logging.h"

#include "base/strings/stringprintf.h"

#include "base/sys_info.h"

+#include "build/build_config.h"

#include "components/policy/core/browser/browser_policy_connector.h"

#include "components/version_info/version_info.h"

@@ -55,9 +57,9 @@ std::string DeviceManagementServiceConfiguration::GetPlatformParameter() {

std::string os_version("-");

#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)

- 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);