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

Unified Diff: chrome/browser/shell_integration_win.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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
Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 6ed09cfd9a7e39679c0849b0d99439bb2bd332b1..a3b8529ed645efb4b27d2ac3684797b92cb00e72 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -8,11 +8,14 @@
#include <shlwapi.h>
#include <shobjidl.h>
#include <propkey.h> // Needs to come after shobjidl.h.
+#include <stddef.h>
+#include <stdint.h>
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "base/path_service.h"
@@ -469,7 +472,7 @@ void ShellIntegration::MigrateChromiumShortcuts() {
// This needs to happen eventually (e.g. so that the appid is fixed and the
// run-time Chrome icon is merged with the taskbar shortcut), but this is not
// urgent and shouldn't delay Chrome startup.
- static const int64 kMigrateChromiumShortcutsDelaySeconds = 15;
+ static const int64_t kMigrateChromiumShortcutsDelaySeconds = 15;
BrowserThread::PostDelayedTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&MigrateChromiumShortcutsCallback),
« no previous file with comments | « chrome/browser/shell_integration_linux_unittest.cc ('k') | chrome/browser/shell_integration_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698