summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.h
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-20 09:07:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-20 17:08:04 +0000
commitdb567a8a9c712673720b763b3de1b159959a228d (patch)
tree4bc4c20cd4bb5c0dca82210be0820506b1f15420 /ash/root_window_controller.h
parent0f2f93dda42f9cab0912e4bdd06b359f8b10b767 (diff)
downloadchromium_src-db567a8a9c712673720b763b3de1b159959a228d.zip
chromium_src-db567a8a9c712673720b763b3de1b159959a228d.tar.gz
chromium_src-db567a8a9c712673720b763b3de1b159959a228d.tar.bz2
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}
Diffstat (limited to 'ash/root_window_controller.h')
-rw-r--r--ash/root_window_controller.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 1138a0d..139b11e 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -11,7 +11,7 @@
#include "ash/shelf/shelf_types.h"
#include "ash/shell_observer.h"
#include "ash/system/user/login_status.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"