Switch to standard integer types in ash/.

ash/shelf/shelf_alignment_menu.h

 // Copyright 2013 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_SHELF_SHELF_ALIGNMENT_MENU_H_
 #define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
 
 #include "ash/ash_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace aura {
 class RootWindow;
 }
 
 namespace ash {
 
 // Submenu for choosing the alignment of the launcher.
 class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel,
@@ skipping 18 matching lines @@
   };
 
   aura::Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_