Index: chrome/browser/chromeos/login/app_launch_controller.h |
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h |
index 1c9f34f4d282bd9c3f8b0d1dc1841ea421a541bd..c95f86e9c3745901689563ace7b74a46ffad0961 100644 |
--- a/chrome/browser/chromeos/login/app_launch_controller.h |
+++ b/chrome/browser/chromeos/login/app_launch_controller.h |
@@ -5,10 +5,12 @@ |
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ |
#define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ |
+#include <stdint.h> |
+ |
#include <string> |
-#include "base/basictypes.h" |
#include "base/callback_forward.h" |
+#include "base/macros.h" |
#include "base/timer/timer.h" |
#include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
#include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h" |
@@ -135,7 +137,7 @@ class AppLaunchController |
bool network_wait_timedout_; |
bool showing_network_dialog_; |
bool network_config_requested_; |
- int64 launch_splash_start_time_; |
+ int64_t launch_splash_start_time_; |
static bool skip_splash_wait_; |
static int network_wait_time_; |