diff options
| author | avi <avi@chromium.org> | 2015-12-24 10:33:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-24 18:34:35 +0000 |
| commit | b8cb7bf12f090e3a68fc5131064b1308677f4057 (patch) | |
| tree | 28b3c677a1d4de169c42dc4679979bce4f6f75b9 /ui/wm/public | |
| parent | 739878c1ff9be79b8abecdf68efea8ef6105623f (diff) | |
| download | chromium_src-b8cb7bf12f090e3a68fc5131064b1308677f4057.zip chromium_src-b8cb7bf12f090e3a68fc5131064b1308677f4057.tar.gz chromium_src-b8cb7bf12f090e3a68fc5131064b1308677f4057.tar.bz2 | |
Switch to standard integer types in ui/wm/.
BUG=138542
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/1544153002
Cr-Commit-Position: refs/heads/master@{#366831}
Diffstat (limited to 'ui/wm/public')
| -rw-r--r-- | ui/wm/public/scoped_tooltip_disabler.h | 1 | ||||
| -rw-r--r-- | ui/wm/public/transient_window_client.cc | 2 | ||||
| -rw-r--r-- | ui/wm/public/transient_window_client.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/ui/wm/public/scoped_tooltip_disabler.h b/ui/wm/public/scoped_tooltip_disabler.h index 82d9879..c9dfd8f 100644 --- a/ui/wm/public/scoped_tooltip_disabler.h +++ b/ui/wm/public/scoped_tooltip_disabler.h @@ -5,6 +5,7 @@ #ifndef UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ #define UI_WM_PUBLIC_SCOPED_TOOLTIP_DISABLER_H_ +#include "base/macros.h" #include "ui/aura/window_observer.h" namespace aura { diff --git a/ui/wm/public/transient_window_client.cc b/ui/wm/public/transient_window_client.cc index aab8e51..6397e669 100644 --- a/ui/wm/public/transient_window_client.cc +++ b/ui/wm/public/transient_window_client.cc @@ -9,7 +9,7 @@ namespace client { namespace { -TransientWindowClient* instance = NULL; +TransientWindowClient* instance = nullptr; } // namespace diff --git a/ui/wm/public/transient_window_client.h b/ui/wm/public/transient_window_client.h index 2086100..4ce537f 100644 --- a/ui/wm/public/transient_window_client.h +++ b/ui/wm/public/transient_window_client.h @@ -5,7 +5,6 @@ #ifndef UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ #define UI_WM_PUBLIC_TRANSIENT_WINDOW_CLIENT_H_ -#include "base/basictypes.h" #include "ui/aura/aura_export.h" namespace aura { |