Switch to standard integer types in ash/.

BUG=138542
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/1540753002

Cr-Commit-Position: refs/heads/master@{#366304}

11 files changed, 15 insertions, 9 deletions

diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc
index 83e5d26..23a46e3 100644
--- a/ash/accelerators/accelerator_commands.cc
+++ b/ash/accelerators/accelerator_commands.cc
@@ -72,9 +72,9 @@ bool ZoomInternalDisplay(bool up) {
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  int64 display_id = display_manager->IsInUnifiedMode()
-                         ? DisplayManager::kUnifiedDisplayId
-                         : display_manager->GetDisplayIdForUIScaling();
+  int64_t display_id = display_manager->IsInUnifiedMode()
+                           ? DisplayManager::kUnifiedDisplayId
+                           : display_manager->GetDisplayIdForUIScaling();
   const DisplayInfo& display_info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
 
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index 79cc673..2304f08 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -5,15 +5,17 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
+#include <stddef.h>
+
 #include <map>
 #include <set>
 
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accelerators/exit_warning_handler.h"
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_history.h"
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index e9dac97..c855bf4 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -5,7 +5,7 @@
 #include "ash/accelerators/accelerator_table.h"
 
 #include "ash/strings/grit/ash_strings.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace ash {
 
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 3619ccd..0267e92 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -5,8 +5,9 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 
+#include <stddef.h>
+
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc
index c8878fd..747c2d0 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -5,7 +5,6 @@
 #include <set>
 
 #include "ash/accelerators/accelerator_table.h"
-#include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index 21e4aff..e60bb4d 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -28,7 +28,7 @@
 namespace ash {
 namespace {
 
-const int64 kTimeOutMilliseconds = 2000;
+const int64_t kTimeOutMilliseconds = 2000;
 // Color of the text of the warning message.
 const SkColor kTextColor = SK_ColorWHITE;
 // Color of the window background.
diff --git a/ash/accelerators/exit_warning_handler.h b/ash/accelerators/exit_warning_handler.h
index 7de5fc8..fb9d721 100644
--- a/ash/accelerators/exit_warning_handler.h
+++ b/ash/accelerators/exit_warning_handler.h
@@ -6,6 +6,7 @@
 #define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/base/accelerators/accelerator.h"
diff --git a/ash/accelerators/focus_manager_factory.h b/ash/accelerators/focus_manager_factory.h
index fc14151..202f230 100644
--- a/ash/accelerators/focus_manager_factory.h
+++ b/ash/accelerators/focus_manager_factory.h
@@ -5,8 +5,8 @@
 #ifndef ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
 #define ASH_ACCELERATORS_FOCUS_MANAGER_FACTORY_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_manager_factory.h"
 
diff --git a/ash/accelerators/key_hold_detector.h b/ash/accelerators/key_hold_detector.h
index 4a21547..f50a35c 100644
--- a/ash/accelerators/key_hold_detector.h
+++ b/ash/accelerators/key_hold_detector.h
@@ -6,6 +6,7 @@
 #define ASH_ACCELERATOR_KEY_HOLD_DETECTOR_H_
 
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/accelerators/magnifier_key_scroller.h b/ash/accelerators/magnifier_key_scroller.h
index 41f5ce15..40fbd9e 100644
--- a/ash/accelerators/magnifier_key_scroller.h
+++ b/ash/accelerators/magnifier_key_scroller.h
@@ -7,6 +7,7 @@
 
 #include "ash/accelerators/key_hold_detector.h"
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"
 
diff --git a/ash/accelerators/spoken_feedback_toggler.h b/ash/accelerators/spoken_feedback_toggler.h
index dd0bb99..5b2b7d0 100644
--- a/ash/accelerators/spoken_feedback_toggler.h
+++ b/ash/accelerators/spoken_feedback_toggler.h
@@ -7,6 +7,7 @@
 
 #include "ash/accelerators/key_hold_detector.h"
 #include "ash/ash_export.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_handler.h"