Switch to standard integer types in ash/.

ash/display/display_configurator_animation.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
 #define ASH_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/display/chromeos/display_configurator.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 }  // namespace aura
 
 namespace ui {
@@ skipping 36 matching lines @@
   std::map<aura::Window*, ui::Layer*> hiding_layers_;
   scoped_ptr<base::OneShotTimer> timer_;
   base::WeakPtrFactory<DisplayConfiguratorAnimation> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorAnimation);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_