components/component_updater/component_updater_service.cc - Issue 590333002: Replace usage of basictypes.h with a combination of stdint.h and base/macros.h.

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: components/component_updater/component_updater_service.cc

Issue 590333002: Replace usage of basictypes.h with a combination of stdint.h and base/macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Created 6 years, 3 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 | « components/component_updater/component_updater_service.h ('k') | components/component_updater/component_updater_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/component_updater/component_updater_service.cc

diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc

index aa69cddd1bcde09d019cd54f35fd7c0383dddbfa..519b0f671b6b4376db55772e45d851a3d48b97df 100644

--- a/components/component_updater/component_updater_service.cc

+++ b/components/component_updater/component_updater_service.cc

@@ -16,6 +16,7 @@

#include "base/files/file_path.h"

#include "base/files/file_util.h"

#include "base/logging.h"

+#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop/message_loop_proxy.h"

#include "base/observer_list.h"

@@ -120,7 +121,7 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {

// Context for a crx download url request.

struct CRXContext {

ComponentInstaller* installer;

- std::vector<uint8> pk_hash;

+ std::vector<uint8_t> pk_hash;

std::string id;

std::string fingerprint;

CRXContext() : installer(NULL) {}

@@ -319,7 +320,7 @@ void CrxUpdateService::ScheduleNextRun(StepDelayInterval step_delay) {

// Keep the delay short if in the middle of an update (step_delay),

// or there are new requested_work_items_ that have not been processed yet.

- int64 delay_seconds = 0;

+ int64_t delay_seconds = 0;

if (!HasOnDemandItems()) {

switch (step_delay) {

case kStepDelayShort: