Switch to standard integer types in ash/.

ash/shelf/shelf.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_H_
 #define ASH_SHELF_SHELF_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
 }
 
 namespace aura {
 class Window;
@@ skipping 97 matching lines @@
   ShelfDelegate* delegate_;
 
   ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_