Switch to standard integer types in ash/.

ash/shelf/shelf_window_watcher_item_delegate.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_WINDOW_WATCHER_ITEM_DELEGATE_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 
 #include "ash/shelf/shelf_item_delegate.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 class ShelfModel;
 
 // ShelfItemDelegate for the items created by ShelfWindowWatcher.
 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
@@ skipping 19 matching lines @@
 
   // Not owned.
   ShelfModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_