diff options
| author | avi <avi@chromium.org> | 2015-12-25 18:10:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 02:11:32 +0000 |
| commit | b896c715dd14ec1f7ac800350b40eeb6de2ba868 (patch) | |
| tree | acc471478046a775c3492046a40c2ea84e8ea88a /chrome/browser/sessions/session_restore.cc | |
| parent | f5b61be8a18b07a2a928f10bf1f8f0e8a5358f13 (diff) | |
| download | chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.zip chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.gz chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.bz2 | |
Switch to standard integer types in chrome/browser/, part 3 of 4.
BUG=138542
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1548133002
Cr-Commit-Position: refs/heads/master@{#366883}
Diffstat (limited to 'chrome/browser/sessions/session_restore.cc')
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index a4ff024..1406de2 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sessions/session_restore.h" +#include <stddef.h> + #include <algorithm> #include <list> #include <set> @@ -14,6 +16,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/debug/alias.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/metrics/field_trial.h" @@ -21,6 +24,7 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "base/task/cancelable_task_tracker.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" @@ -753,7 +757,7 @@ Browser* SessionRestore::RestoreSession( Profile* profile, Browser* browser, chrome::HostDesktopType host_desktop_type, - uint32 behavior, + uint32_t behavior, const std::vector<GURL>& urls_to_open) { #if defined(OS_CHROMEOS) chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker( @@ -780,7 +784,7 @@ Browser* SessionRestore::RestoreSession( // static void SessionRestore::RestoreSessionAfterCrash(Browser* browser) { - uint32 behavior = 0; + uint32_t behavior = 0; if (browser->tab_strip_model()->count() == 1) { const content::WebContents* active_tab = browser->tab_strip_model()->GetWebContentsAt(0); |