diff options
| author | avi <avi@chromium.org> | 2015-12-22 22:53:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 06:54:22 +0000 |
| commit | fba04a5abfa4c7740abb03ecb160802e5e66a811 (patch) | |
| tree | 1d91c7296337846a7487bead2545f0ee2737d164 | |
| parent | 6c57ed900648bf699491cb8d2bb90f82f703ec20 (diff) | |
| download | chromium_src-fba04a5abfa4c7740abb03ecb160802e5e66a811.zip chromium_src-fba04a5abfa4c7740abb03ecb160802e5e66a811.tar.gz chromium_src-fba04a5abfa4c7740abb03ecb160802e5e66a811.tar.bz2 | |
Switch to standard integer types in ui/views/.
BUG=138542
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/1543173002
Cr-Commit-Position: refs/heads/master@{#366723}
353 files changed, 627 insertions, 163 deletions
diff --git a/ui/views/accessibility/ax_aura_obj_cache.cc b/ui/views/accessibility/ax_aura_obj_cache.cc index 2105dd8..3d4850e 100644 --- a/ui/views/accessibility/ax_aura_obj_cache.cc +++ b/ui/views/accessibility/ax_aura_obj_cache.cc @@ -33,15 +33,15 @@ AXAuraObjWrapper* AXAuraObjCache::GetOrCreate(aura::Window* window) { return CreateInternal<AXWindowObjWrapper>(window, window_to_id_map_); } -int32 AXAuraObjCache::GetID(View* view) { +int32_t AXAuraObjCache::GetID(View* view) { return GetIDInternal(view, view_to_id_map_); } -int32 AXAuraObjCache::GetID(Widget* widget) { +int32_t AXAuraObjCache::GetID(Widget* widget) { return GetIDInternal(widget, widget_to_id_map_); } -int32 AXAuraObjCache::GetID(aura::Window* window) { +int32_t AXAuraObjCache::GetID(aura::Window* window) { return GetIDInternal(window, window_to_id_map_); } @@ -68,8 +68,8 @@ void AXAuraObjCache::Remove(aura::Window* window) { RemoveInternal(window, window_to_id_map_); } -AXAuraObjWrapper* AXAuraObjCache::Get(int32 id) { - std::map<int32, AXAuraObjWrapper*>::iterator it = cache_.find(id); +AXAuraObjWrapper* AXAuraObjCache::Get(int32_t id) { + std::map<int32_t, AXAuraObjWrapper*>::iterator it = cache_.find(id); if (it == cache_.end()) return NULL; @@ -77,7 +77,7 @@ AXAuraObjWrapper* AXAuraObjCache::Get(int32 id) { return it->second; } -void AXAuraObjCache::Remove(int32 id) { +void AXAuraObjCache::Remove(int32_t id) { AXAuraObjWrapper* obj = Get(id); if (id == -1 || !obj) @@ -89,7 +89,8 @@ void AXAuraObjCache::Remove(int32 id) { void AXAuraObjCache::GetTopLevelWindows( std::vector<AXAuraObjWrapper*>* children) { - for (std::map<aura::Window*, int32>::iterator it = window_to_id_map_.begin(); + for (std::map<aura::Window*, int32_t>::iterator it = + window_to_id_map_.begin(); it != window_to_id_map_.end(); ++it) { if (!it->first->parent()) children->push_back(GetOrCreate(it->first)); @@ -107,11 +108,12 @@ AXAuraObjCache::~AXAuraObjCache() { template <typename AuraViewWrapper, typename AuraView> AXAuraObjWrapper* AXAuraObjCache::CreateInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) { + AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map) { if (!aura_view) return NULL; - typename std::map<AuraView*, int32>::iterator it = + typename std::map<AuraView*, int32_t>::iterator it = aura_view_to_id_map.find(aura_view); if (it != aura_view_to_id_map.end()) @@ -124,12 +126,14 @@ AXAuraObjWrapper* AXAuraObjCache::CreateInternal( return wrapper; } -template<typename AuraView> int32 AXAuraObjCache::GetIDInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) { +template <typename AuraView> +int32_t AXAuraObjCache::GetIDInternal( + AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map) { if (!aura_view) return -1; - typename std::map<AuraView*, int32>::iterator it = + typename std::map<AuraView*, int32_t>::iterator it = aura_view_to_id_map.find(aura_view); if (it != aura_view_to_id_map.end()) @@ -138,10 +142,11 @@ template<typename AuraView> int32 AXAuraObjCache::GetIDInternal( return -1; } -template<typename AuraView> +template <typename AuraView> void AXAuraObjCache::RemoveInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map) { - int32 id = GetID(aura_view); + AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map) { + int32_t id = GetID(aura_view); if (id == -1) return; aura_view_to_id_map.erase(aura_view); diff --git a/ui/views/accessibility/ax_aura_obj_cache.h b/ui/views/accessibility/ax_aura_obj_cache.h index 95c46f3..a7bb50c 100644 --- a/ui/views/accessibility/ax_aura_obj_cache.h +++ b/ui/views/accessibility/ax_aura_obj_cache.h @@ -5,10 +5,12 @@ #ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ #define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_CACHE_H_ +#include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/views_export.h" namespace base { @@ -36,13 +38,13 @@ class VIEWS_EXPORT AXAuraObjCache { AXAuraObjWrapper* GetOrCreate(aura::Window* window); // Gets an id given an Aura view. - int32 GetID(View* view); - int32 GetID(Widget* widget); - int32 GetID(aura::Window* window); + int32_t GetID(View* view); + int32_t GetID(Widget* widget); + int32_t GetID(aura::Window* window); // Gets the next unique id for this cache. Useful for non-Aura view backed // views. - int32 GetNextID() { return current_id_++; } + int32_t GetNextID() { return current_id_++; } // Removes an entry from this cache based on an Aura view. void Remove(View* view); @@ -53,10 +55,10 @@ class VIEWS_EXPORT AXAuraObjCache { void RemoveViewSubtree(View* view); // Lookup a cached entry based on an id. - AXAuraObjWrapper* Get(int32 id); + AXAuraObjWrapper* Get(int32_t id); // Remove a cached entry based on an id. - void Remove(int32 id); + void Remove(int32_t id); // Get all top level windows this cache knows about. void GetTopLevelWindows(std::vector<AXAuraObjWrapper*>* children); @@ -71,21 +73,24 @@ class VIEWS_EXPORT AXAuraObjCache { virtual ~AXAuraObjCache(); template <typename AuraViewWrapper, typename AuraView> - AXAuraObjWrapper* CreateInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); + AXAuraObjWrapper* CreateInternal( + AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map); - template<typename AuraView> int32 GetIDInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); + template <typename AuraView> + int32_t GetIDInternal(AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map); - template<typename AuraView> void RemoveInternal( - AuraView* aura_view, std::map<AuraView*, int32>& aura_view_to_id_map); + template <typename AuraView> + void RemoveInternal(AuraView* aura_view, + std::map<AuraView*, int32_t>& aura_view_to_id_map); - std::map<views::View*, int32> view_to_id_map_; - std::map<views::Widget*, int32> widget_to_id_map_; - std::map<aura::Window*, int32> window_to_id_map_; + std::map<views::View*, int32_t> view_to_id_map_; + std::map<views::Widget*, int32_t> widget_to_id_map_; + std::map<aura::Window*, int32_t> window_to_id_map_; - std::map<int32, AXAuraObjWrapper*> cache_; - int32 current_id_; + std::map<int32_t, AXAuraObjWrapper*> cache_; + int32_t current_id_; // True immediately when entering this object's destructor. bool is_destroying_; diff --git a/ui/views/accessibility/ax_aura_obj_wrapper.h b/ui/views/accessibility/ax_aura_obj_wrapper.h index ab6f925..7257c7b 100644 --- a/ui/views/accessibility/ax_aura_obj_wrapper.h +++ b/ui/views/accessibility/ax_aura_obj_wrapper.h @@ -5,9 +5,10 @@ #ifndef UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_WRAPPER_H_ #define UI_VIEWS_ACCESSIBILITY_AX_AURA_OBJ_WRAPPER_H_ +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/gfx/geometry/point.h" @@ -30,13 +31,13 @@ class VIEWS_EXPORT AXAuraObjWrapper { virtual void GetChildren( std::vector<AXAuraObjWrapper*>* out_children) = 0; virtual void Serialize(ui::AXNodeData* out_node_data) = 0; - virtual int32 GetID() = 0; + virtual int32_t GetID() = 0; // Actions. virtual void DoDefault() {} virtual void Focus() {} virtual void MakeVisible() {} - virtual void SetSelection(int32 start, int32 end) {} + virtual void SetSelection(int32_t start, int32_t end) {} virtual void ShowContextMenu() {} }; diff --git a/ui/views/accessibility/ax_view_obj_wrapper.cc b/ui/views/accessibility/ax_view_obj_wrapper.cc index c2bff91..4363d19 100644 --- a/ui/views/accessibility/ax_view_obj_wrapper.cc +++ b/ui/views/accessibility/ax_view_obj_wrapper.cc @@ -73,7 +73,7 @@ void AXViewObjWrapper::Serialize(ui::AXNodeData* out_node_data) { } } -int32 AXViewObjWrapper::GetID() { +int32_t AXViewObjWrapper::GetID() { return AXAuraObjCache::GetInstance()->GetID(view_); } @@ -96,7 +96,7 @@ void AXViewObjWrapper::MakeVisible() { // TODO(dtseng): Implement. } -void AXViewObjWrapper::SetSelection(int32 start, int32 end) { +void AXViewObjWrapper::SetSelection(int32_t start, int32_t end) { // TODO(dtseng): Implement. } diff --git a/ui/views/accessibility/ax_view_obj_wrapper.h b/ui/views/accessibility/ax_view_obj_wrapper.h index 39cbc65..89683cc 100644 --- a/ui/views/accessibility/ax_view_obj_wrapper.h +++ b/ui/views/accessibility/ax_view_obj_wrapper.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_ACCESSIBILITY_AX_VIEW_OBJ_WRAPPER_H_ #define UI_VIEWS_ACCESSIBILITY_AX_VIEW_OBJ_WRAPPER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/views/accessibility/ax_aura_obj_wrapper.h" namespace views { @@ -22,11 +25,11 @@ class AXViewObjWrapper : public AXAuraObjWrapper { AXAuraObjWrapper* GetParent() override; void GetChildren(std::vector<AXAuraObjWrapper*>* out_children) override; void Serialize(ui::AXNodeData* out_node_data) override; - int32 GetID() override; + int32_t GetID() override; void DoDefault() override; void Focus() override; void MakeVisible() override; - void SetSelection(int32 start, int32 end) override; + void SetSelection(int32_t start, int32_t end) override; void ShowContextMenu() override; private: diff --git a/ui/views/accessibility/ax_widget_obj_wrapper.cc b/ui/views/accessibility/ax_widget_obj_wrapper.cc index 44fcfa8..25183a8 100644 --- a/ui/views/accessibility/ax_widget_obj_wrapper.cc +++ b/ui/views/accessibility/ax_widget_obj_wrapper.cc @@ -42,7 +42,7 @@ void AXWidgetObjWrapper::Serialize(ui::AXNodeData* out_node_data) { out_node_data->state = 0; } -int32 AXWidgetObjWrapper::GetID() { +int32_t AXWidgetObjWrapper::GetID() { return AXAuraObjCache::GetInstance()->GetID(widget_); } diff --git a/ui/views/accessibility/ax_widget_obj_wrapper.h b/ui/views/accessibility/ax_widget_obj_wrapper.h index d6c3e48..4913581 100644 --- a/ui/views/accessibility/ax_widget_obj_wrapper.h +++ b/ui/views/accessibility/ax_widget_obj_wrapper.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_ACCESSIBILITY_AX_WIDGET_OBJ_WRAPPER_H_ #define UI_VIEWS_ACCESSIBILITY_AX_WIDGET_OBJ_WRAPPER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/views/accessibility/ax_aura_obj_wrapper.h" #include "ui/views/widget/widget_observer.h" #include "ui/views/widget/widget_removals_observer.h" @@ -24,7 +27,7 @@ class AXWidgetObjWrapper : public AXAuraObjWrapper, AXAuraObjWrapper* GetParent() override; void GetChildren(std::vector<AXAuraObjWrapper*>* out_children) override; void Serialize(ui::AXNodeData* out_node_data) override; - int32 GetID() override; + int32_t GetID() override; // WidgetObserver overrides. void OnWidgetDestroying(Widget* widget) override; diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc index de0dcf2..124ae78 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.cc +++ b/ui/views/accessibility/ax_window_obj_wrapper.cc @@ -4,6 +4,8 @@ #include "ui/views/accessibility/ax_window_obj_wrapper.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_node_data.h" #include "ui/aura/window.h" @@ -58,7 +60,7 @@ void AXWindowObjWrapper::Serialize(ui::AXNodeData* out_node_data) { } } -int32 AXWindowObjWrapper::GetID() { +int32_t AXWindowObjWrapper::GetID() { return AXAuraObjCache::GetInstance()->GetID(window_); } diff --git a/ui/views/accessibility/ax_window_obj_wrapper.h b/ui/views/accessibility/ax_window_obj_wrapper.h index 7d904aa..2bc46aa 100644 --- a/ui/views/accessibility/ax_window_obj_wrapper.h +++ b/ui/views/accessibility/ax_window_obj_wrapper.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_ACCESSIBILITY_AX_WINDOW_OBJ_WRAPPER_H_ #define UI_VIEWS_ACCESSIBILITY_AX_WINDOW_OBJ_WRAPPER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/aura/window_observer.h" #include "ui/views/accessibility/ax_aura_obj_wrapper.h" @@ -31,7 +34,7 @@ class AXWindowObjWrapper : public AXAuraObjWrapper, AXAuraObjWrapper* GetParent() override; void GetChildren(std::vector<AXAuraObjWrapper*>* out_children) override; void Serialize(ui::AXNodeData* out_node_data) override; - int32 GetID() override; + int32_t GetID() override; // WindowObserver overrides. void OnWindowDestroying(aura::Window* window) override; diff --git a/ui/views/accessibility/native_view_accessibility.cc b/ui/views/accessibility/native_view_accessibility.cc index 431268f..07406e5 100644 --- a/ui/views/accessibility/native_view_accessibility.cc +++ b/ui/views/accessibility/native_view_accessibility.cc @@ -5,6 +5,7 @@ #include "ui/views/accessibility/native_view_accessibility.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/events/event_utils.h" #include "ui/views/controls/native/native_view_host.h" diff --git a/ui/views/accessibility/native_view_accessibility.h b/ui/views/accessibility/native_view_accessibility.h index 12b4342..ac59130 100644 --- a/ui/views/accessibility/native_view_accessibility.h +++ b/ui/views/accessibility/native_view_accessibility.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_ #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_ +#include "base/macros.h" +#include "build/build_config.h" #include "ui/accessibility/ax_node_data.h" #include "ui/accessibility/platform/ax_platform_node.h" #include "ui/accessibility/platform/ax_platform_node_delegate.h" diff --git a/ui/views/accessibility/native_view_accessibility_auralinux.cc b/ui/views/accessibility/native_view_accessibility_auralinux.cc index 8d76503..90927af 100644 --- a/ui/views/accessibility/native_view_accessibility_auralinux.cc +++ b/ui/views/accessibility/native_view_accessibility_auralinux.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <vector> +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/stl_util.h" #include "ui/accessibility/ax_enums.h" diff --git a/ui/views/accessibility/native_view_accessibility_auralinux.h b/ui/views/accessibility/native_view_accessibility_auralinux.h index f817dc7..84b8059 100644 --- a/ui/views/accessibility/native_view_accessibility_auralinux.h +++ b/ui/views/accessibility/native_view_accessibility_auralinux.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_AURALINUX_H_ #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_AURALINUX_H_ +#include "base/macros.h" #include "ui/views/accessibility/native_view_accessibility.h" #include "ui/views/view.h" diff --git a/ui/views/accessibility/native_view_accessibility_win.h b/ui/views/accessibility/native_view_accessibility_win.h index dadbcba..dffd39a 100644 --- a/ui/views/accessibility/native_view_accessibility_win.h +++ b/ui/views/accessibility/native_view_accessibility_win.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ +#include "base/macros.h" #include "ui/views/accessibility/native_view_accessibility.h" #include "ui/views/view.h" diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index 792e280..c4f033c 100644 --- a/ui/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_view.cc @@ -4,6 +4,7 @@ #include "ui/views/accessible_pane_view.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "ui/accessibility/ax_view_state.h" #include "ui/views/focus/focus_search.h" diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h index 1fc5c2d..36170a8 100644 --- a/ui/views/accessible_pane_view.h +++ b/ui/views/accessible_pane_view.h @@ -6,6 +6,7 @@ #define UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ui/base/accelerators/accelerator.h" diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc index 16c2a32..303d206 100644 --- a/ui/views/accessible_pane_view_unittest.cc +++ b/ui/views/accessible_pane_view_unittest.cc @@ -4,6 +4,8 @@ #include "ui/views/accessible_pane_view.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/base/accelerators/accelerator.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/layout/fill_layout.h" diff --git a/ui/views/animation/bounds_animator.h b/ui/views/animation/bounds_animator.h index b5602ca..68dad46 100644 --- a/ui/views/animation/bounds_animator.h +++ b/ui/views/animation/bounds_animator.h @@ -8,6 +8,7 @@ #include <map> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "ui/gfx/animation/animation_container_observer.h" diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc index 27f2b58..7e09deb 100644 --- a/ui/views/animation/bounds_animator_unittest.cc +++ b/ui/views/animation/bounds_animator_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/animation/bounds_animator.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/animation/test_animation_delegate.h" diff --git a/ui/views/animation/ink_drop_animation_controller.h b/ui/views/animation/ink_drop_animation_controller.h index 77aed3b..d4d4fce 100644 --- a/ui/views/animation/ink_drop_animation_controller.h +++ b/ui/views/animation/ink_drop_animation_controller.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_ #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "ui/compositor/layer_tree_owner.h" diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc index f260d9d..6a3f8a3 100644 --- a/ui/views/animation/ink_drop_animation_controller_factory.cc +++ b/ui/views/animation/ink_drop_animation_controller_factory.cc @@ -4,6 +4,7 @@ #include "ui/views/animation/ink_drop_animation_controller_factory.h" +#include "base/macros.h" #include "ui/base/resource/material_design/material_design_controller.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/ui/views/animation/ink_drop_animation_controller_impl.h b/ui/views/animation/ink_drop_animation_controller_impl.h index 5ca2563..c533883 100644 --- a/ui/views/animation/ink_drop_animation_controller_impl.h +++ b/ui/views/animation/ink_drop_animation_controller_impl.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/ui/views/animation/scroll_animator.h b/ui/views/animation/scroll_animator.h index dcca55a..5473315 100644 --- a/ui/views/animation/scroll_animator.h +++ b/ui/views/animation/scroll_animator.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ #define UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/views_export.h" diff --git a/ui/views/animation/test/ink_drop_animation_test_api.h b/ui/views/animation/test/ink_drop_animation_test_api.h index 631c328..61c3852 100644 --- a/ui/views/animation/test/ink_drop_animation_test_api.h +++ b/ui/views/animation/test/ink_drop_animation_test_api.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ #define UI_VIEWS_ANIMATION_TEST_INK_DROP_ANIMATION_TEST_API_H_ +#include "base/macros.h" #include "ui/gfx/geometry/size.h" namespace views { diff --git a/ui/views/background.cc b/ui/views/background.cc index 41e0277..5338f37 100644 --- a/ui/views/background.cc +++ b/ui/views/background.cc @@ -5,6 +5,8 @@ #include "ui/views/background.h" #include "base/logging.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/painter.h" diff --git a/ui/views/background.h b/ui/views/background.h index 8ecca6e..0d7d65c 100644 --- a/ui/views/background.h +++ b/ui/views/background.h @@ -5,16 +5,17 @@ #ifndef UI_VIEWS_BACKGROUND_H_ #define UI_VIEWS_BACKGROUND_H_ +#include <stddef.h> + +#include "base/macros.h" #include "build/build_config.h" +#include "third_party/skia/include/core/SkColor.h" +#include "ui/views/views_export.h" #if defined(OS_WIN) #include <windows.h> #endif // defined(OS_WIN) -#include "base/basictypes.h" -#include "third_party/skia/include/core/SkColor.h" -#include "ui/views/views_export.h" - namespace gfx { class Canvas; } diff --git a/ui/views/border.cc b/ui/views/border.cc index b6679a5..9b87180 100644 --- a/ui/views/border.cc +++ b/ui/views/border.cc @@ -5,6 +5,7 @@ #include "ui/views/border.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/border.h b/ui/views/border.h index 6bbcec7..e09dbeb 100644 --- a/ui/views/border.h +++ b/ui/views/border.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_BORDER_H_ #define UI_VIEWS_BORDER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/insets.h" diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h index f4dbcbe..fac3a71 100644 --- a/ui/views/bubble/bubble_border.h +++ b/ui/views/bubble/bubble_border.h @@ -5,9 +5,9 @@ #ifndef UI_VIEWS_BUBBLE_BUBBLE_BORDER_H_ #define UI_VIEWS_BUBBLE_BUBBLE_BORDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/background.h" diff --git a/ui/views/bubble/bubble_border_unittest.cc b/ui/views/bubble/bubble_border_unittest.cc index d129434..e472e1b 100644 --- a/ui/views/bubble/bubble_border_unittest.cc +++ b/ui/views/bubble/bubble_border_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/bubble/bubble_border.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc index 11dc4ff..fd922e4 100644 --- a/ui/views/bubble/bubble_delegate.cc +++ b/ui/views/bubble/bubble_delegate.cc @@ -4,6 +4,7 @@ #include "ui/views/bubble/bubble_delegate.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h index 1bd9634..4bc7f4a 100644 --- a/ui/views/bubble/bubble_delegate.h +++ b/ui/views/bubble/bubble_delegate.h @@ -6,6 +6,7 @@ #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc index 1ec4e39..92201c0 100644 --- a/ui/views/bubble/bubble_delegate_unittest.cc +++ b/ui/views/bubble/bubble_delegate_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "ui/base/hit_test.h" #include "ui/events/event_utils.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc index 419f342..b11ee79 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc @@ -7,6 +7,7 @@ #include <algorithm> #include <utility> +#include "build/build_config.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h index 28750c3..6a4a0f3 100644 --- a/ui/views/bubble/bubble_frame_view.h +++ b/ui/views/bubble/bubble_frame_view.h @@ -5,9 +5,9 @@ #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/controls/button/button.h" #include "ui/views/window/non_client_view.h" diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc index c84a669..908b190 100644 --- a/ui/views/bubble/bubble_frame_view_unittest.cc +++ b/ui/views/bubble/bubble_frame_view_unittest.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/ui/views/bubble/bubble_window_targeter.h b/ui/views/bubble/bubble_window_targeter.h index 129a9ce..fd9550f 100644 --- a/ui/views/bubble/bubble_window_targeter.h +++ b/ui/views/bubble/bubble_window_targeter.h @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "ui/views/views_export.h" #include "ui/wm/core/masked_window_targeter.h" diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc index 103cc3d..8ae398f 100644 --- a/ui/views/bubble/bubble_window_targeter_unittest.cc +++ b/ui/views/bubble/bubble_window_targeter_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/bubble/bubble_window_targeter.h" +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_utils.h" diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc index 68becc4..daa24f8 100644 --- a/ui/views/bubble/tray_bubble_view.cc +++ b/ui/views/bubble/tray_bubble_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "base/macros.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h index 4bcb7fe..db42f4a 100644 --- a/ui/views/bubble/tray_bubble_view.h +++ b/ui/views/bubble/tray_bubble_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_ #define UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/mouse_watcher.h" diff --git a/ui/views/cocoa/bridged_native_widget.h b/ui/views/cocoa/bridged_native_widget.h index 90e85fc..8f65230 100644 --- a/ui/views/cocoa/bridged_native_widget.h +++ b/ui/views/cocoa/bridged_native_widget.h @@ -6,13 +6,15 @@ #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_ #import <Cocoa/Cocoa.h> + #include <vector> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#import "ui/accelerated_widget_mac/accelerated_widget_mac.h" #include "ui/base/ime/input_method_delegate.h" #include "ui/compositor/layer_owner.h" -#import "ui/accelerated_widget_mac/accelerated_widget_mac.h" #import "ui/views/cocoa/bridged_native_widget_owner.h" #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h" #import "ui/views/focus/focus_manager.h" diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm index 14de487..24bba74 100644 --- a/ui/views/cocoa/bridged_native_widget.mm +++ b/ui/views/cocoa/bridged_native_widget.mm @@ -5,6 +5,8 @@ #import "ui/views/cocoa/bridged_native_widget.h" #import <objc/runtime.h> +#include <stddef.h> +#include <stdint.h> #include "base/logging.h" #import "base/mac/foundation_util.h" diff --git a/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm b/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm index 2e4985e..5e8579f 100644 --- a/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm +++ b/ui/views/cocoa/bridged_native_widget_interactive_uitest.mm @@ -8,8 +8,9 @@ #import "base/mac/mac_util.h" #import "base/mac/sdk_forward_declarations.h" -#import "ui/base/test/nswindow_fullscreen_notification_waiter.h" +#include "base/macros.h" #include "ui/base/hit_test.h" +#import "ui/base/test/nswindow_fullscreen_notification_waiter.h" #import "ui/base/test/windowed_nsnotification_observer.h" #import "ui/events/test/cocoa_test_event_utils.h" #include "ui/views/test/widget_test.h" diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm index 3f0d110..b1a43ec 100644 --- a/ui/views/cocoa/bridged_native_widget_unittest.mm +++ b/ui/views/cocoa/bridged_native_widget_unittest.mm @@ -9,6 +9,7 @@ #import "base/mac/foundation_util.h" #import "base/mac/mac_util.h" #import "base/mac/sdk_forward_declarations.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" diff --git a/ui/views/cocoa/cocoa_mouse_capture.mm b/ui/views/cocoa/cocoa_mouse_capture.mm index 1fc0d68..17d34ec 100644 --- a/ui/views/cocoa/cocoa_mouse_capture.mm +++ b/ui/views/cocoa/cocoa_mouse_capture.mm @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/logging.h" +#include "base/macros.h" #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h" namespace views { diff --git a/ui/views/cocoa/cocoa_mouse_capture_unittest.mm b/ui/views/cocoa/cocoa_mouse_capture_unittest.mm index 911efad..371a3fc 100644 --- a/ui/views/cocoa/cocoa_mouse_capture_unittest.mm +++ b/ui/views/cocoa/cocoa_mouse_capture_unittest.mm @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "ui/events/test/cocoa_test_event_utils.h" #import "ui/gfx/test/ui_cocoa_test_helper.h" #import "ui/views/cocoa/cocoa_mouse_capture_delegate.h" diff --git a/ui/views/cocoa/widget_owner_nswindow_adapter.h b/ui/views/cocoa/widget_owner_nswindow_adapter.h index 6d5517e..986da1c 100644 --- a/ui/views/cocoa/widget_owner_nswindow_adapter.h +++ b/ui/views/cocoa/widget_owner_nswindow_adapter.h @@ -6,6 +6,7 @@ #define UI_VIEWS_COCOA_WIDGET_OWNER_NSWINDOW_ADAPTER_H_ #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "ui/views/cocoa/bridged_native_widget_owner.h" @class NSView; diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc index a321dc4..2c63883 100644 --- a/ui/views/color_chooser/color_chooser_view.cc +++ b/ui/views/color_chooser/color_chooser_view.cc @@ -4,7 +4,10 @@ #include "ui/views/color_chooser/color_chooser_view.h" +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -47,7 +50,7 @@ bool GetColorFromText(const base::string16& text, SkColor* result) { std::string input = base::UTF16ToUTF8((text.size() == 6) ? text : text.substr(1)); - std::vector<uint8> hex; + std::vector<uint8_t> hex; if (!base::HexStringToBytes(input, &hex)) return false; diff --git a/ui/views/color_chooser/color_chooser_view.h b/ui/views/color_chooser/color_chooser_view.h index 5c3322a..912e600 100644 --- a/ui/views/color_chooser/color_chooser_view.h +++ b/ui/views/color_chooser/color_chooser_view.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_ #define UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkScalar.h" #include "ui/views/controls/textfield/textfield_controller.h" diff --git a/ui/views/controls/button/blue_button.h b/ui/views/controls/button/blue_button.h index 6335f0a..2599a88 100644 --- a/ui/views/controls/button/blue_button.h +++ b/ui/views/controls/button/blue_button.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_BUTTON_BLUE_BUTTON_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/button/label_button.h" namespace views { diff --git a/ui/views/controls/button/blue_button_unittest.cc b/ui/views/controls/button/blue_button_unittest.cc index 5038ed8..8fc77280 100644 --- a/ui/views/controls/button/blue_button_unittest.cc +++ b/ui/views/controls/button/blue_button_unittest.cc @@ -6,6 +6,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/gfx/canvas.h" #include "ui/gfx/skia_util.h" #include "ui/views/controls/button/label_button_border.h" diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h index 31c821d..0f1160b 100644 --- a/ui/views/controls/button/button.h +++ b/ui/views/controls/button/button.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_ #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_ +#include "base/macros.h" #include "ui/native_theme/native_theme.h" #include "ui/views/view.h" diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc index 4948a32..2ab281f 100644 --- a/ui/views/controls/button/checkbox.cc +++ b/ui/views/controls/button/checkbox.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/button/checkbox.h" +#include <stddef.h> + #include <utility> #include "ui/accessibility/ax_view_state.h" diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h index ebe7380..0b96f0b 100644 --- a/ui/views/controls/button/checkbox.h +++ b/ui/views/controls/button/checkbox.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/controls/button/label_button.h" diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h index 2b3c35a..55c392e 100644 --- a/ui/views/controls/button/custom_button.h +++ b/ui/views/controls/button/custom_button.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/events/event_constants.h" #include "ui/gfx/animation/animation_delegate.h" diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc index 5704e73..ef26e19 100644 --- a/ui/views/controls/button/custom_button_unittest.cc +++ b/ui/views/controls/button/custom_button_unittest.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/button/custom_button.h" +#include "base/macros.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/layout.h" #include "ui/events/event_utils.h" diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h index bb3f526..71311fe 100644 --- a/ui/views/controls/button/image_button.h +++ b/ui/views/controls/button/image_button.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/layout.h" #include "ui/gfx/image/image_skia.h" diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index 2b870a2..308e2dd 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc @@ -4,10 +4,13 @@ #include "ui/views/controls/button/label_button.h" +#include <stddef.h> + #include <utility> #include "base/lazy_instance.h" #include "base/logging.h" +#include "build/build_config.h" #include "ui/gfx/animation/throb_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h index b3ebc08..6e5bc50 100644 --- a/ui/views/controls/button/label_button.h +++ b/ui/views/controls/button/label_button.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/image/image_skia.h" diff --git a/ui/views/controls/button/label_button_border.h b/ui/views/controls/button/label_button_border.h index 746ed378..48b3352 100644 --- a/ui/views/controls/button/label_button_border.h +++ b/ui/views/controls/button/label_button_border.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_BORDER_H_ #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_BORDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/border.h" diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc index 30f78a4..0bfb7d9 100644 --- a/ui/views/controls/button/label_button_unittest.cc +++ b/ui/views/controls/button/label_button_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/button/label_button.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/accessibility/ax_view_state.h" diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h index b7a1a8b..d908db8 100644 --- a/ui/views/controls/button/menu_button.h +++ b/ui/views/controls/button/menu_button.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc index 104c19f..8d554c9 100644 --- a/ui/views/controls/button/menu_button_unittest.cc +++ b/ui/views/controls/button/menu_button_unittest.cc @@ -4,8 +4,10 @@ #include "ui/views/controls/button/menu_button.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/events/test/event_generator.h" #include "ui/views/controls/button/menu_button_listener.h" diff --git a/ui/views/controls/button/radio_button.h b/ui/views/controls/button/radio_button.h index da1e7f9..07639d1 100644 --- a/ui/views/controls/button/radio_button.h +++ b/ui/views/controls/button/radio_button.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_ #define UI_VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/controls/button/checkbox.h" diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index c03b85d..9372f4a6 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc @@ -4,9 +4,13 @@ #include "ui/views/controls/combobox/combobox.h" +#include <stddef.h> + #include <utility> #include "base/logging.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/ime/input_method.h" #include "ui/base/models/combobox_model.h" diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h index e07e70f..a0f5b48 100644 --- a/ui/views/controls/combobox/combobox.h +++ b/ui/views/controls/combobox/combobox.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/time/time.h" diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc index 0d1211c..8692678 100644 --- a/ui/views/controls/combobox/combobox_unittest.cc +++ b/ui/views/controls/combobox/combobox_unittest.cc @@ -6,8 +6,9 @@ #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/models/combobox_model.h" diff --git a/ui/views/controls/focusable_border.h b/ui/views/controls/focusable_border.h index cd3ac9e..eb24ca5 100644 --- a/ui/views/controls/focusable_border.h +++ b/ui/views/controls/focusable_border.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ #define UI_VIEWS_CONTROLS_FOCUSABLE_BORDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/border.h" #include "ui/views/view.h" diff --git a/ui/views/controls/glow_hover_controller.h b/ui/views/controls/glow_hover_controller.h index 00bf528..3dd2d13 100644 --- a/ui/views/controls/glow_hover_controller.h +++ b/ui/views/controls/glow_hover_controller.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_GLOW_HOVER_CONTROLLER_H_ #define UI_VIEWS_CONTROLS_GLOW_HOVER_CONTROLLER_H_ +#include "base/macros.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/views_export.h" diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h index 2b67516..401289a 100644 --- a/ui/views/controls/image_view.h +++ b/ui/views/controls/image_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/view.h" diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index 1db1689..99137e6 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/label.h" +#include <stddef.h> + #include <algorithm> #include <cmath> #include <limits> diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h index 6d07646..b2520e3 100644 --- a/ui/views/controls/label.h +++ b/ui/views/controls/label.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/gfx/render_text.h" #include "ui/views/view.h" diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc index 47cb37a..9d07433 100644 --- a/ui/views/controls/label_unittest.cc +++ b/ui/views/controls/label_unittest.cc @@ -4,8 +4,11 @@ #include "ui/views/controls/label.h" +#include <stddef.h> + #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ui/views/controls/link.h b/ui/views/controls/link.h index fb577c8..01da62e 100644 --- a/ui/views/controls/link.h +++ b/ui/views/controls/link.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/views/controls/label.h" diff --git a/ui/views/controls/menu/display_change_listener_aura.cc b/ui/views/controls/menu/display_change_listener_aura.cc index 8198af4..1872281 100644 --- a/ui/views/controls/menu/display_change_listener_aura.cc +++ b/ui/views/controls/menu/display_change_listener_aura.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 43f167e..cae826f 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -6,8 +6,10 @@ #include "base/i18n/case_conversion.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/events/event.h" diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index a28c4cc..b550ad7 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h @@ -7,11 +7,14 @@ #include "build/build_config.h" +#include <stddef.h> + #include <list> #include <set> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc index 6cff855..f611988 100644 --- a/ui/views/controls/menu/menu_controller_unittest.cc +++ b/ui/views/controls/menu/menu_controller_unittest.cc @@ -4,7 +4,9 @@ #include "ui/views/controls/menu/menu_controller.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/aura/scoped_window_targeter.h" #include "ui/aura/window.h" #include "ui/events/event_handler.h" diff --git a/ui/views/controls/menu/menu_event_dispatcher.h b/ui/views/controls/menu/menu_event_dispatcher.h index cc6eeba..6b9e8e3 100644 --- a/ui/views/controls/menu/menu_event_dispatcher.h +++ b/ui/views/controls/menu/menu_event_dispatcher.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_EVENT_DISPATCHER_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_EVENT_DISPATCHER_H_ +#include <stdint.h> + #include "base/macros.h" #include "ui/events/platform/platform_event_dispatcher.h" diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc index 06e14e3..9840abb 100644 --- a/ui/views/controls/menu/menu_host.cc +++ b/ui/views/controls/menu/menu_host.cc @@ -6,6 +6,7 @@ #include "base/auto_reset.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "ui/events/gestures/gesture_recognizer.h" #include "ui/gfx/path.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/menu/menu_host.h b/ui/views/controls/menu/menu_host.h index f39c33e..ef44bd0 100644 --- a/ui/views/controls/menu/menu_host.h +++ b/ui/views/controls/menu/menu_host.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/menu/menu_host_root_view.h b/ui/views/controls/menu/menu_host_root_view.h index 1a2aabd..62437f8 100644 --- a/ui/views/controls/menu/menu_host_root_view.h +++ b/ui/views/controls/menu/menu_host_root_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_HOST_ROOT_VIEW_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_HOST_ROOT_VIEW_H_ +#include "base/macros.h" #include "ui/views/widget/root_view.h" namespace views { diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index f9e4956..5721126 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc @@ -4,7 +4,10 @@ #include "ui/views/controls/menu/menu_item_view.h" +#include <stddef.h> + #include "base/i18n/case_conversion.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/accessibility/ax_view_state.h" diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h index b6a9010..d6a22bf 100644 --- a/ui/views/controls/menu/menu_item_view.h +++ b/ui/views/controls/menu/menu_item_view.h @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "build/build_config.h" #include "ui/base/models/menu_separator_types.h" diff --git a/ui/views/controls/menu/menu_message_loop_aura.cc b/ui/views/controls/menu/menu_message_loop_aura.cc index 0182239..3cb1068 100644 --- a/ui/views/controls/menu/menu_message_loop_aura.cc +++ b/ui/views/controls/menu/menu_message_loop_aura.cc @@ -4,7 +4,9 @@ #include "ui/views/controls/menu/menu_message_loop_aura.h" +#include "base/macros.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ui/views/controls/menu/menu_message_loop_aura.h b/ui/views/controls/menu/menu_message_loop_aura.h index 0c3b4dc..bdb8352 100644 --- a/ui/views/controls/menu/menu_message_loop_aura.h +++ b/ui/views/controls/menu/menu_message_loop_aura.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/controls/menu/menu_message_loop.h" diff --git a/ui/views/controls/menu/menu_message_loop_mac.h b/ui/views/controls/menu/menu_message_loop_mac.h index de97e88..ed5cfdb 100644 --- a/ui/views/controls/menu/menu_message_loop_mac.h +++ b/ui/views/controls/menu/menu_message_loop_mac.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_MENU_MENU_MESSAGE_LOOP_MAC_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/controls/menu/menu_message_loop.h" namespace base { diff --git a/ui/views/controls/menu/menu_message_pump_dispatcher_win.h b/ui/views/controls/menu/menu_message_pump_dispatcher_win.h index afc54fe..44a0aad 100644 --- a/ui/views/controls/menu/menu_message_pump_dispatcher_win.h +++ b/ui/views/controls/menu/menu_message_pump_dispatcher_win.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_MESSAGE_PUMP_DISPATCHER_WIN_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_MESSAGE_PUMP_DISPATCHER_WIN_H_ +#include <stdint.h> + #include "base/macros.h" #include "base/message_loop/message_pump_dispatcher.h" diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h index 5fc9d3e..ecc4f1e 100644 --- a/ui/views/controls/menu/menu_model_adapter.h +++ b/ui/views/controls/menu/menu_model_adapter.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "ui/views/controls/menu/menu_delegate.h" namespace ui { diff --git a/ui/views/controls/menu/menu_model_adapter_unittest.cc b/ui/views/controls/menu/menu_model_adapter_unittest.cc index ad98a15..63d7788 100644 --- a/ui/views/controls/menu/menu_model_adapter_unittest.cc +++ b/ui/views/controls/menu/menu_model_adapter_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/menu/menu_model_adapter.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/menu_model.h" #include "ui/base/models/menu_model_delegate.h" diff --git a/ui/views/controls/menu/menu_runner.cc b/ui/views/controls/menu/menu_runner.cc index 373b230..f639f68 100644 --- a/ui/views/controls/menu/menu_runner.cc +++ b/ui/views/controls/menu/menu_runner.cc @@ -11,14 +11,12 @@ namespace views { -MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32 run_types) +MenuRunner::MenuRunner(ui::MenuModel* menu_model, int32_t run_types) : run_types_(run_types), - impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) { -} + impl_(internal::MenuRunnerImplInterface::Create(menu_model, run_types)) {} -MenuRunner::MenuRunner(MenuItemView* menu_view, int32 run_types) - : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) { -} +MenuRunner::MenuRunner(MenuItemView* menu_view, int32_t run_types) + : run_types_(run_types), impl_(new internal::MenuRunnerImpl(menu_view)) {} MenuRunner::~MenuRunner() { impl_->Release(); diff --git a/ui/views/controls/menu/menu_runner.h b/ui/views/controls/menu/menu_runner.h index a55f2d1..4011ece9 100644 --- a/ui/views/controls/menu/menu_runner.h +++ b/ui/views/controls/menu/menu_runner.h @@ -5,8 +5,10 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/menu/menu_types.h" @@ -104,8 +106,8 @@ class VIEWS_EXPORT MenuRunner { // Creates a new MenuRunner. // |run_types| is a bitmask of RunTypes. - MenuRunner(ui::MenuModel* menu_model, int32 run_types); - MenuRunner(MenuItemView* menu, int32 run_types); + MenuRunner(ui::MenuModel* menu_model, int32_t run_types); + MenuRunner(MenuItemView* menu, int32_t run_types); ~MenuRunner(); // Runs the menu. If this returns MENU_DELETED the method is returning @@ -135,7 +137,7 @@ class VIEWS_EXPORT MenuRunner { // Sets an implementation of RunMenuAt. This is intended to be used at test. void SetRunnerHandler(scoped_ptr<MenuRunnerHandler> runner_handler); - const int32 run_types_; + const int32_t run_types_; // We own this. No scoped_ptr because it is destroyed by calling Release(). internal::MenuRunnerImplInterface* impl_; diff --git a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm index 357a200..d25a662 100644 --- a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm +++ b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm @@ -6,6 +6,7 @@ #import <Cocoa/Cocoa.h> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #import "testing/gtest_mac.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ui/views/controls/menu/menu_runner_handler.h b/ui/views/controls/menu/menu_runner_handler.h index 47d75c8..9ce4ea3 100644 --- a/ui/views/controls/menu/menu_runner_handler.h +++ b/ui/views/controls/menu/menu_runner_handler.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_HANDLER_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> namespace views { @@ -23,7 +23,7 @@ class VIEWS_EXPORT MenuRunnerHandler { const gfx::Rect& bounds, MenuAnchorPosition anchor, ui::MenuSourceType source_type, - int32 types) = 0; + int32_t types) = 0; }; } // namespace views diff --git a/ui/views/controls/menu/menu_runner_impl.cc b/ui/views/controls/menu/menu_runner_impl.cc index 1cb6aea..d02f7de 100644 --- a/ui/views/controls/menu/menu_runner_impl.cc +++ b/ui/views/controls/menu/menu_runner_impl.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/menu/menu_runner_impl.h" +#include "build/build_config.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/menu_controller.h" @@ -22,7 +23,7 @@ namespace internal { #if !defined(OS_MACOSX) MenuRunnerImplInterface* MenuRunnerImplInterface::Create( ui::MenuModel* menu_model, - int32 run_types) { + int32_t run_types) { return new MenuRunnerImplAdapter(menu_model); } #endif @@ -73,7 +74,7 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) { + int32_t run_types) { closing_event_time_ = base::TimeDelta(); if (running_) { // Ignore requests to show the menu while it's already showing. MenuItemView diff --git a/ui/views/controls/menu/menu_runner_impl.h b/ui/views/controls/menu/menu_runner_impl.h index f68b987..cf31f81 100644 --- a/ui/views/controls/menu/menu_runner_impl.h +++ b/ui/views/controls/menu/menu_runner_impl.h @@ -7,8 +7,11 @@ #include "ui/views/controls/menu/menu_runner_impl_interface.h" +#include <stdint.h> + #include <set> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "ui/views/controls/menu/menu_controller_delegate.h" @@ -33,7 +36,7 @@ class MenuRunnerImpl : public MenuRunnerImplInterface, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) override; + int32_t run_types) override; void Cancel() override; base::TimeDelta GetClosingEventTime() const override; diff --git a/ui/views/controls/menu/menu_runner_impl_adapter.cc b/ui/views/controls/menu/menu_runner_impl_adapter.cc index 2e6822e..72c4cf1 100644 --- a/ui/views/controls/menu/menu_runner_impl_adapter.cc +++ b/ui/views/controls/menu/menu_runner_impl_adapter.cc @@ -29,7 +29,7 @@ MenuRunner::RunResult MenuRunnerImplAdapter::RunMenuAt( MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 types) { + int32_t types) { return impl_->RunMenuAt(parent, button, bounds, anchor, types); } diff --git a/ui/views/controls/menu/menu_runner_impl_adapter.h b/ui/views/controls/menu/menu_runner_impl_adapter.h index b2fbab2..f41abe1 100644 --- a/ui/views/controls/menu/menu_runner_impl_adapter.h +++ b/ui/views/controls/menu/menu_runner_impl_adapter.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_ADAPTER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "ui/views/controls/menu/menu_runner_impl_interface.h" namespace views { @@ -24,7 +27,7 @@ class MenuRunnerImplAdapter : public MenuRunnerImplInterface { MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 types) override; + int32_t types) override; void Cancel() override; base::TimeDelta GetClosingEventTime() const override; diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.h b/ui/views/controls/menu/menu_runner_impl_cocoa.h index 56f9984..f1ae21f 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.h +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.h @@ -7,7 +7,10 @@ #include "ui/views/controls/menu/menu_runner_impl_interface.h" +#include <stdint.h> + #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/time/time.h" @class MenuController; @@ -26,7 +29,7 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface { MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) override; + int32_t run_types) override; void Cancel() override; base::TimeDelta GetClosingEventTime() const override; diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.mm b/ui/views/controls/menu/menu_runner_impl_cocoa.mm index 6468258..4754781 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm @@ -82,7 +82,7 @@ base::scoped_nsobject<NSView> CreateMenuAnchorView( // static MenuRunnerImplInterface* MenuRunnerImplInterface::Create( ui::MenuModel* menu_model, - int32 run_types) { + int32_t run_types) { if ((run_types & kNativeRunTypes) != 0 && (run_types & MenuRunner::IS_NESTED) == 0) { return new MenuRunnerImplCocoa(menu_model); @@ -117,7 +117,7 @@ MenuRunner::RunResult MenuRunnerImplCocoa::RunMenuAt(Widget* parent, MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) { + int32_t run_types) { DCHECK(run_types & kNativeRunTypes); DCHECK(!IsRunning()); DCHECK(parent); diff --git a/ui/views/controls/menu/menu_runner_impl_interface.h b/ui/views/controls/menu/menu_runner_impl_interface.h index 0914cba..4c9cd88 100644 --- a/ui/views/controls/menu/menu_runner_impl_interface.h +++ b/ui/views/controls/menu/menu_runner_impl_interface.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_INTERFACE_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_INTERFACE_H_ +#include <stdint.h> + #include "ui/views/controls/menu/menu_runner.h" namespace views { @@ -22,7 +24,7 @@ class MenuRunnerImplInterface { // Creates a concrete instance for running |menu_model|. // |run_types| is a bitmask of MenuRunner::RunTypes. static MenuRunnerImplInterface* Create(ui::MenuModel* menu_model, - int32 run_types); + int32_t run_types); // Returns true if we're in a nested message loop running the menu. virtual bool IsRunning() const = 0; @@ -35,7 +37,7 @@ class MenuRunnerImplInterface { MenuButton* button, const gfx::Rect& bounds, MenuAnchorPosition anchor, - int32 run_types) + int32_t run_types) WARN_UNUSED_RESULT = 0; // Hides and cancels the menu. diff --git a/ui/views/controls/menu/menu_runner_unittest.cc b/ui/views/controls/menu/menu_runner_unittest.cc index 4d45b14..b8e1528 100644 --- a/ui/views/controls/menu/menu_runner_unittest.cc +++ b/ui/views/controls/menu/menu_runner_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/controls/menu/menu_runner.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/menu/menu_delegate.h" @@ -63,7 +66,7 @@ class MenuRunnerTest : public ViewsTestBase { // Initializes a MenuRunner with |run_types|. It takes ownership of // |menu_item_view_|. - void InitMenuRunner(int32 run_types); + void InitMenuRunner(int32_t run_types); MenuItemView* menu_item_view() { return menu_item_view_; } TestMenuDelegate* menu_delegate() { return menu_delegate_.get(); } @@ -89,7 +92,7 @@ MenuRunnerTest::MenuRunnerTest() {} MenuRunnerTest::~MenuRunnerTest() {} -void MenuRunnerTest::InitMenuRunner(int32 run_types) { +void MenuRunnerTest::InitMenuRunner(int32_t run_types) { menu_runner_.reset(new MenuRunner(menu_item_view_, run_types)); } diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index 80a63af..05c8cae 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/menu/menu_scroll_view_container.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/accessibility/ax_view_state.h" diff --git a/ui/views/controls/menu/menu_scroll_view_container.h b/ui/views/controls/menu/menu_scroll_view_container.h index dc83f25..d2a2548 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.h +++ b/ui/views/controls/menu/menu_scroll_view_container.h @@ -5,9 +5,10 @@ #ifndef UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ #define UI_VIEWS_CONTROLS_MENU_MENU_SCROLL_VIEW_CONTAINER_H_ -#include "ui/views/view.h" +#include "base/macros.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/controls/menu/menu_types.h" +#include "ui/views/view.h" namespace views { diff --git a/ui/views/controls/menu/menu_separator.h b/ui/views/controls/menu/menu_separator.h index 966e03f..f7dea48 100644 --- a/ui/views/controls/menu/menu_separator.h +++ b/ui/views/controls/menu/menu_separator.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_MENU_MENU_SEPARATOR_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/models/menu_separator_types.h" #include "ui/views/view.h" diff --git a/ui/views/controls/menu/menu_separator_views.cc b/ui/views/controls/menu/menu_separator_views.cc index 6194136..357bad8 100644 --- a/ui/views/controls/menu/menu_separator_views.cc +++ b/ui/views/controls/menu/menu_separator_views.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/menu/menu_separator.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/canvas.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/menu/submenu_view.h b/ui/views/controls/menu/submenu_view.h index ff8b36e..11243ff 100644 --- a/ui/views/controls/menu/submenu_view.h +++ b/ui/views/controls/menu/submenu_view.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/animation/scroll_animator.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/prefix_delegate.h" diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc index dc09ce9..8633ffb 100644 --- a/ui/views/controls/message_box_view.cc +++ b/ui/views/controls/message_box_view.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/message_box_view.h" +#include <stddef.h> + #include "base/i18n/rtl.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_split.h" diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h index 2bb4331..2d83532 100644 --- a/ui/views/controls/message_box_view.h +++ b/ui/views/controls/message_box_view.h @@ -5,8 +5,11 @@ #ifndef UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ #define UI_VIEWS_CONTROLS_MESSAGE_BOX_VIEW_H_ +#include <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/view.h" @@ -43,7 +46,7 @@ class VIEWS_EXPORT MessageBoxView : public View { explicit InitParams(const base::string16& message); ~InitParams(); - uint16 options; + uint16_t options; base::string16 message; base::string16 default_prompt; int message_width; diff --git a/ui/views/controls/native/native_view_host.h b/ui/views/controls/native/native_view_host.h index 0779d8f..f0770ba 100644 --- a/ui/views/controls/native/native_view_host.h +++ b/ui/views/controls/native/native_view_host.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/view.h" diff --git a/ui/views/controls/native/native_view_host_aura.h b/ui/views/controls/native/native_view_host_aura.h index 3942ce0..67d7756 100644 --- a/ui/views/controls/native/native_view_host_aura.h +++ b/ui/views/controls/native/native_view_host_aura.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_AURA_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/views/controls/native/native_view_host_wrapper.h" diff --git a/ui/views/controls/native/native_view_host_aura_unittest.cc b/ui/views/controls/native/native_view_host_aura_unittest.cc index 16053ed..685267d 100644 --- a/ui/views/controls/native/native_view_host_aura_unittest.cc +++ b/ui/views/controls/native/native_view_host_aura_unittest.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/native/native_view_host_aura.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" diff --git a/ui/views/controls/native/native_view_host_mac_unittest.mm b/ui/views/controls/native/native_view_host_mac_unittest.mm index c476f96..ea91605 100644 --- a/ui/views/controls/native/native_view_host_mac_unittest.mm +++ b/ui/views/controls/native/native_view_host_mac_unittest.mm @@ -8,6 +8,7 @@ #import "base/mac/scoped_nsautorelease_pool.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #import "testing/gtest_mac.h" #include "ui/views/controls/native/native_view_host.h" diff --git a/ui/views/controls/native/native_view_host_test_base.cc b/ui/views/controls/native/native_view_host_test_base.cc index ab40692..b0fbc85 100644 --- a/ui/views/controls/native/native_view_host_test_base.cc +++ b/ui/views/controls/native/native_view_host_test_base.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/native/native_view_host_test_base.h" +#include "base/macros.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc index bed3057..c152959 100644 --- a/ui/views/controls/native/native_view_host_unittest.cc +++ b/ui/views/controls/native/native_view_host_unittest.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/native/native_view_host.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/window.h" #include "ui/views/controls/native/native_view_host_test_base.h" diff --git a/ui/views/controls/prefix_selector.cc b/ui/views/controls/prefix_selector.cc index 723e0e40..1ba5feb 100644 --- a/ui/views/controls/prefix_selector.cc +++ b/ui/views/controls/prefix_selector.cc @@ -15,7 +15,7 @@ namespace views { namespace { -const int64 kTimeBeforeClearingMS = 1000; +const int64_t kTimeBeforeClearingMS = 1000; void ConvertRectToScreen(const views::View* src, gfx::Rect* r) { DCHECK(src); @@ -80,7 +80,7 @@ gfx::Rect PrefixSelector::GetCaretBounds() const { return rect; } -bool PrefixSelector::GetCompositionCharacterBounds(uint32 index, +bool PrefixSelector::GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const { // TextInputClient::GetCompositionCharacterBounds is expected to fill |rect| // in screen coordinates and GetCaretBounds returns screen coordinates. diff --git a/ui/views/controls/prefix_selector.h b/ui/views/controls/prefix_selector.h index 2b3988b..438b011 100644 --- a/ui/views/controls/prefix_selector.h +++ b/ui/views/controls/prefix_selector.h @@ -5,6 +5,10 @@ #ifndef UI_VIEWS_CONTROLS_PREFIX_SELECTOR_H_ #define UI_VIEWS_CONTROLS_PREFIX_SELECTOR_H_ +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "ui/base/ime/text_input_client.h" @@ -35,7 +39,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInputClient { int GetTextInputFlags() const override; bool CanComposeInline() const override; gfx::Rect GetCaretBounds() const override; - bool GetCompositionCharacterBounds(uint32 index, + bool GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const override; bool HasCompositionText() const override; bool GetTextRange(gfx::Range* range) const override; diff --git a/ui/views/controls/prefix_selector_unittest.cc b/ui/views/controls/prefix_selector_unittest.cc index fe2651c..cb109c2 100644 --- a/ui/views/controls/prefix_selector_unittest.cc +++ b/ui/views/controls/prefix_selector_unittest.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/views/controls/prefix_delegate.h" diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc index b5935dd..0a9fd12 100644 --- a/ui/views/controls/progress_bar.cc +++ b/ui/views/controls/progress_bar.cc @@ -8,6 +8,7 @@ #include <string> #include "base/logging.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkXfermode.h" diff --git a/ui/views/controls/progress_bar.h b/ui/views/controls/progress_bar.h index ab3a62a..3fb5fb7 100644 --- a/ui/views/controls/progress_bar.h +++ b/ui/views/controls/progress_bar.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_PROGRESS_BAR_H_ #define UI_VIEWS_CONTROLS_PROGRESS_BAR_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/controls/resize_area.h b/ui/views/controls/resize_area.h index e3900a4..406d015 100644 --- a/ui/views/controls/resize_area.h +++ b/ui/views/controls/resize_area.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index 8a04a02..3dae5a3 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc @@ -5,6 +5,7 @@ #include "ui/views/controls/scroll_view.h" #include "base/logging.h" +#include "base/macros.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/native_theme/native_theme.h" diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h index a4be46a..da38480 100644 --- a/ui/views/controls/scroll_view.h +++ b/ui/views/controls/scroll_view.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/controls/scrollbar/scroll_bar.h" namespace views { diff --git a/ui/views/controls/scroll_view_unittest.cc b/ui/views/controls/scroll_view_unittest.cc index cac64be..c813709 100644 --- a/ui/views/controls/scroll_view_unittest.cc +++ b/ui/views/controls/scroll_view_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/scroll_view.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #include "ui/views/test/test_views.h" diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h index fec2fd8..f54a880 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.h +++ b/ui/views/controls/scrollbar/base_scroll_bar.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/animation/scroll_animator.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/image_button.h" diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.h b/ui/views/controls/scrollbar/base_scroll_bar_button.h index 28eb196..cb269ba 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_button.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_button.h @@ -7,6 +7,8 @@ #include "ui/views/controls/button/custom_button.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/views/repeat_controller.h" #if defined(OS_LINUX) diff --git a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h index 8d0aa94..ea16b14 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_thumb.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_thumb.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_THUMB_H_ #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_THUMB_H_ +#include "base/macros.h" #include "ui/gfx/geometry/size.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/scrollbar/scroll_bar.h" diff --git a/ui/views/controls/scrollbar/kennedy_scroll_bar.cc b/ui/views/controls/scrollbar/kennedy_scroll_bar.cc index bd4e0a0..35c8161 100644 --- a/ui/views/controls/scrollbar/kennedy_scroll_bar.cc +++ b/ui/views/controls/scrollbar/kennedy_scroll_bar.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/scrollbar/kennedy_scroll_bar.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkXfermode.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/scrollbar/kennedy_scroll_bar.h b/ui/views/controls/scrollbar/kennedy_scroll_bar.h index cb13732..f56e4a9 100644 --- a/ui/views/controls/scrollbar/kennedy_scroll_bar.h +++ b/ui/views/controls/scrollbar/kennedy_scroll_bar.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_KENNEDY_SCROLL_BAR_H_ #define UI_VIEWS_CONTROLS_SCROLLBAR_KENNEDY_SCROLL_BAR_H_ +#include "base/macros.h" #include "ui/views/controls/scrollbar/base_scroll_bar.h" namespace views { diff --git a/ui/views/controls/scrollbar/native_scroll_bar.h b/ui/views/controls/scrollbar/native_scroll_bar.h index 70b14c1..c9d96af 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar.h +++ b/ui/views/controls/scrollbar/native_scroll_bar.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/controls/scrollbar/scroll_bar.h" #include "ui/views/view.h" diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.h b/ui/views/controls/scrollbar/native_scroll_bar_views.h index e201b2e..d09f60d 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_VIEWS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/point.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/button.h" diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.cc b/ui/views/controls/scrollbar/overlay_scroll_bar.cc index 0fe6abb..fa72066 100644 --- a/ui/views/controls/scrollbar/overlay_scroll_bar.cc +++ b/ui/views/controls/scrollbar/overlay_scroll_bar.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkXfermode.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/scrollbar/overlay_scroll_bar.h b/ui/views/controls/scrollbar/overlay_scroll_bar.h index 6c7e436..4463548 100644 --- a/ui/views/controls/scrollbar/overlay_scroll_bar.h +++ b/ui/views/controls/scrollbar/overlay_scroll_bar.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_OVERLAY_SCROLL_BAR_H_ #define UI_VIEWS_CONTROLS_SCROLLBAR_OVERLAY_SCROLL_BAR_H_ +#include "base/macros.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/controls/scrollbar/base_scroll_bar.h" diff --git a/ui/views/controls/scrollbar/scroll_bar.h b/ui/views/controls/scrollbar/scroll_bar.h index cd6fc37..8d7ff13 100644 --- a/ui/views/controls/scrollbar/scroll_bar.h +++ b/ui/views/controls/scrollbar/scroll_bar.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_SCROLL_BAR_H_ #define UI_VIEWS_CONTROLS_SCROLLBAR_SCROLL_BAR_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/controls/scrollbar/scrollbar_unittest.cc b/ui/views/controls/scrollbar/scrollbar_unittest.cc index 9318c56..68a6687 100644 --- a/ui/views/controls/scrollbar/scrollbar_unittest.cc +++ b/ui/views/controls/scrollbar/scrollbar_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "ui/views/controls/scrollbar/native_scroll_bar.h" #include "ui/views/controls/scrollbar/native_scroll_bar_views.h" #include "ui/views/controls/scrollbar/scroll_bar.h" diff --git a/ui/views/controls/separator.h b/ui/views/controls/separator.h index b0dfbce..7183e79 100644 --- a/ui/views/controls/separator.h +++ b/ui/views/controls/separator.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/controls/single_split_view.cc b/ui/views/controls/single_split_view.cc index 542d17f..c755691 100644 --- a/ui/views/controls/single_split_view.cc +++ b/ui/views/controls/single_split_view.cc @@ -4,6 +4,7 @@ #include "ui/views/controls/single_split_view.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/cursor/cursor.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/single_split_view.h b/ui/views/controls/single_split_view.h index ddd47bc..2cc21ea 100644 --- a/ui/views/controls/single_split_view.h +++ b/ui/views/controls/single_split_view.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_SINGLE_SPLIT_VIEW_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/controls/single_split_view_unittest.cc b/ui/views/controls/single_split_view_unittest.cc index f56e497..3f3e6a0 100644 --- a/ui/views/controls/single_split_view_unittest.cc +++ b/ui/views/controls/single_split_view_unittest.cc @@ -4,7 +4,10 @@ #include "ui/views/controls/single_split_view.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event_utils.h" #include "ui/views/controls/single_split_view_listener.h" diff --git a/ui/views/controls/slide_out_view.h b/ui/views/controls/slide_out_view.h index b721b3b..7fdb637 100644 --- a/ui/views/controls/slide_out_view.h +++ b/ui/views/controls/slide_out_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SLIDE_OUT_VIEW_H_ #define UI_VIEWS_CONTROLS_SLIDE_OUT_VIEW_H_ +#include "base/macros.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/controls/slider.h b/ui/views/controls/slider.h index afe7516..2940043 100644 --- a/ui/views/controls/slider.h +++ b/ui/views/controls/slider.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_SLIDER_H_ #define UI_VIEWS_CONTROLS_SLIDER_H_ +#include "base/macros.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc index b144cb3..ded1f36 100644 --- a/ui/views/controls/slider_unittest.cc +++ b/ui/views/controls/slider_unittest.cc @@ -7,10 +7,12 @@ #include <string> #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event.h" #include "ui/events/gesture_event_details.h" diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc index 65ee8b2..3909e7f 100644 --- a/ui/views/controls/styled_label.cc +++ b/ui/views/controls/styled_label.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/styled_label.h" +#include <stddef.h> + #include <limits> #include <vector> diff --git a/ui/views/controls/styled_label.h b/ui/views/controls/styled_label.h index 2e5cad3..ee0780e 100644 --- a/ui/views/controls/styled_label.h +++ b/ui/views/controls/styled_label.h @@ -8,7 +8,7 @@ #include <list> #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font_list.h" diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc index 5dd1f2f..3c0a7e7 100644 --- a/ui/views/controls/styled_label_unittest.cc +++ b/ui/views/controls/styled_label_unittest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc index 78edc3e..eb15ac9 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc @@ -5,6 +5,7 @@ #include "ui/views/controls/tabbed_pane/tabbed_pane.h" #include "base/logging.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/accessibility/ax_view_state.h" diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h index 1ca3ac1..76d927a 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane.h +++ b/ui/views/controls/tabbed_pane/tabbed_pane.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/view.h" diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 72ea86c..c13e637 100644 --- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc index 06a26fc..073611d 100644 --- a/ui/views/controls/table/table_header.cc +++ b/ui/views/controls/table/table_header.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/table/table_header.h" +#include <stddef.h> + #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" diff --git a/ui/views/controls/table/table_header.h b/ui/views/controls/table/table_header.h index e88bad6..7fd54e9 100644 --- a/ui/views/controls/table/table_header.h +++ b/ui/views/controls/table/table_header.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_TABLE_TABLE_HEADER_H_ #define UI_VIEWS_CONTROLS_TABLE_TABLE_HEADER_H_ +#include "base/macros.h" #include "ui/gfx/font_list.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/controls/table/table_utils.cc b/ui/views/controls/table/table_utils.cc index 393c22d..bcc0171 100644 --- a/ui/views/controls/table/table_utils.cc +++ b/ui/views/controls/table/table_utils.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/table/table_utils.h" +#include <stddef.h> + #include "base/logging.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" diff --git a/ui/views/controls/table/table_utils_unittest.cc b/ui/views/controls/table/table_utils_unittest.cc index 98b1fd2..f6a97d9 100644 --- a/ui/views/controls/table/table_utils_unittest.cc +++ b/ui/views/controls/table/table_utils_unittest.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/table/table_utils.h" +#include <stddef.h> + #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/font_list.h" diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc index aa18242..3a289f3 100644 --- a/ui/views/controls/table/table_view.cc +++ b/ui/views/controls/table/table_view.cc @@ -4,6 +4,8 @@ #include "ui/views/controls/table/table_view.h" +#include <stddef.h> + #include <map> #include <utility> diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h index a3329e2..55c7a31 100644 --- a/ui/views/controls/table/table_view.h +++ b/ui/views/controls/table/table_view.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/models/list_selection_model.h" #include "ui/base/models/table_model.h" diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc index 72a9901..2618a2f 100644 --- a/ui/views/controls/table/table_view_unittest.cc +++ b/ui/views/controls/table/table_view_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/controls/table/table_view.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/views/controls/table/test_table_model.h b/ui/views/controls/table/test_table_model.h index 45de44b..dbeb4d5 100644 --- a/ui/views/controls/table/test_table_model.h +++ b/ui/views/controls/table/test_table_model.h @@ -6,6 +6,7 @@ #define UI_VIEWS_CONTROLS_TABLE_TEST_TABLE_MODEL_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/base/models/table_model.h" class TestTableModel : public ui::TableModel { diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 84c0fc3..a115af7 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc @@ -8,6 +8,7 @@ #include <utility> #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/cursor/cursor.h" @@ -1497,7 +1498,7 @@ gfx::Rect Textfield::GetCaretBounds() const { return rect; } -bool Textfield::GetCompositionCharacterBounds(uint32 index, +bool Textfield::GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const { DCHECK(rect); if (!HasCompositionText()) diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h index 2cac671..b153edd 100644 --- a/ui/views/controls/textfield/textfield.h +++ b/ui/views/controls/textfield/textfield.h @@ -5,10 +5,13 @@ #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" @@ -290,7 +293,7 @@ class VIEWS_EXPORT Textfield : public View, int GetTextInputFlags() const override; bool CanComposeInline() const override; gfx::Rect GetCaretBounds() const override; - bool GetCompositionCharacterBounds(uint32 index, + bool GetCompositionCharacterBounds(uint32_t index, gfx::Rect* rect) const override; bool HasCompositionText() const override; bool GetTextRange(gfx::Range* range) const override; diff --git a/ui/views/controls/textfield/textfield_model.cc b/ui/views/controls/textfield/textfield_model.cc index 6b17c5c..d5bec8b 100644 --- a/ui/views/controls/textfield/textfield_model.cc +++ b/ui/views/controls/textfield/textfield_model.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/views/controls/textfield/textfield_model.h b/ui/views/controls/textfield/textfield_model.h index 89c84a0..9bdb48c 100644 --- a/ui/views/controls/textfield/textfield_model.h +++ b/ui/views/controls/textfield/textfield_model.h @@ -5,10 +5,13 @@ #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_ #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_ +#include <stddef.h> + #include <list> #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "ui/base/ime/composition_text.h" diff --git a/ui/views/controls/textfield/textfield_model_unittest.cc b/ui/views/controls/textfield/textfield_model_unittest.cc index 1932f0a..4908c2b 100644 --- a/ui/views/controls/textfield/textfield_model_unittest.cc +++ b/ui/views/controls/textfield/textfield_model_unittest.cc @@ -2,13 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <vector> #include "base/auto_reset.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" diff --git a/ui/views/controls/textfield/textfield_test_api.h b/ui/views/controls/textfield/textfield_test_api.h index 1004836..4505b71 100644 --- a/ui/views/controls/textfield/textfield_test_api.h +++ b/ui/views/controls/textfield/textfield_test_api.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_TEST_API_H_ #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_TEST_API_H_ +#include "base/macros.h" #include "ui/views/controls/textfield/textfield.h" namespace views { diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc index 0d0fd29..d4b7d99 100644 --- a/ui/views/controls/textfield/textfield_unittest.cc +++ b/ui/views/controls/textfield/textfield_unittest.cc @@ -4,15 +4,20 @@ #include "ui/views/controls/textfield/textfield.h" +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include <vector> #include "base/command_line.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/pickle.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" @@ -2122,11 +2127,11 @@ TEST_F(TextfieldTest, GetCompositionCharacterBoundsTest) { InitTextfield(); ui::CompositionText composition; composition.text = UTF8ToUTF16("abc123"); - const uint32 char_count = static_cast<uint32>(composition.text.length()); + const uint32_t char_count = static_cast<uint32_t>(composition.text.length()); ui::TextInputClient* client = textfield_; // Compare the composition character bounds with surrounding cursor bounds. - for (uint32 i = 0; i < char_count; ++i) { + for (uint32_t i = 0; i < char_count; ++i) { composition.selection = gfx::Range(i); client->SetCompositionText(composition); gfx::Point cursor_origin = GetCursorBounds().origin(); @@ -2175,7 +2180,7 @@ TEST_F(TextfieldTest, GetCompositionCharacterBounds_ComplexText) { // Make sure GetCompositionCharacterBounds never fails for index. gfx::Rect rects[kUtf16CharsCount]; gfx::Rect prev_cursor = GetCursorBounds(); - for (uint32 i = 0; i < kUtf16CharsCount; ++i) + for (uint32_t i = 0; i < kUtf16CharsCount; ++i) EXPECT_TRUE(client->GetCompositionCharacterBounds(i, &rects[i])); // Here we might expect the following results but it actually depends on how diff --git a/ui/views/controls/throbber.h b/ui/views/controls/throbber.h index f88ee57..c4bbbc5 100644 --- a/ui/views/controls/throbber.h +++ b/ui/views/controls/throbber.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_CONTROLS_THROBBER_H_ #define UI_VIEWS_CONTROLS_THROBBER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "ui/views/view.h" diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h index fdcff67..27a5185 100644 --- a/ui/views/controls/tree/tree_view.h +++ b/ui/views/controls/tree/tree_view.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/base/models/tree_node_model.h" #include "ui/gfx/font_list.h" diff --git a/ui/views/controls/tree/tree_view_unittest.cc b/ui/views/controls/tree/tree_view_unittest.cc index 0af68a9..e87956a 100644 --- a/ui/views/controls/tree/tree_view_unittest.cc +++ b/ui/views/controls/tree/tree_view_unittest.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/tree_node_model.h" diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler.h b/ui/views/controls/webview/unhandled_keyboard_event_handler.h index e444b69..8f06105 100644 --- a/ui/views/controls/webview/unhandled_keyboard_event_handler.h +++ b/ui/views/controls/webview/unhandled_keyboard_event_handler.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_WEBVIEW_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_ #define UI_VIEWS_CONTROLS_WEBVIEW_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/webview/webview_export.h" diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h index d897dbf..a978921c 100644 --- a/ui/views/controls/webview/web_dialog_view.h +++ b/ui/views/controls/webview/web_dialog_view.h @@ -5,10 +5,13 @@ #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ #define UI_VIEWS_CONTROLS_WEBVIEW_WEB_DIALOG_VIEW_H_ +#include <stdint.h> + #include <string> #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/geometry/size.h" #include "ui/views/controls/webview/webview_export.h" diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index d39852b..9a129c0 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -6,6 +6,7 @@ #include <utility> +#include "build/build_config.h" #include "content/public/browser/browser_accessibility_state.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_controller.h" @@ -153,10 +154,10 @@ void WebView::OnBoundsChanged(const gfx::Rect& previous_bounds) { // TODO(miu): This is basically media::ComputeLetterboxRegion(), and it // looks like others have written this code elsewhere. Let's considate // into a shared function ui/gfx/geometry or around there. - const int64 x = static_cast<int64>(capture_size.width()) * - holder_bounds.height(); - const int64 y = static_cast<int64>(capture_size.height()) * - holder_bounds.width(); + const int64_t x = + static_cast<int64_t>(capture_size.width()) * holder_bounds.height(); + const int64_t y = + static_cast<int64_t>(capture_size.height()) * holder_bounds.width(); if (y < x) { holder_bounds.ClampToCenteredSize(gfx::Size( holder_bounds.width(), static_cast<int>(y / capture_size.width()))); diff --git a/ui/views/controls/webview/webview.h b/ui/views/controls/webview/webview.h index dd753e8..cb8ba7a 100644 --- a/ui/views/controls/webview/webview.h +++ b/ui/views/controls/webview/webview.h @@ -5,7 +5,9 @@ #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/render_process_host_observer.h" #include "content/public/browser/web_contents_delegate.h" @@ -136,7 +138,7 @@ class WEBVIEW_EXPORT WebView : public View, void DidDetachInterstitialPage() override; // Workaround for MSVC++ linker bug/feature that requires // instantiation of the inline IPC::Listener methods in all translation units. - void OnChannelConnected(int32 peer_id) override {} + void OnChannelConnected(int32_t peer_id) override {} void OnChannelError() override {} void OnBadMessageReceived(const IPC::Message& message) override {} void OnWebContentsFocused() override; diff --git a/ui/views/controls/webview/webview_unittest.cc b/ui/views/controls/webview/webview_unittest.cc index 76ef42d..bc2a927 100644 --- a/ui/views/controls/webview/webview_unittest.cc +++ b/ui/views/controls/webview/webview_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/controls/webview/webview.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" @@ -86,8 +89,8 @@ class WebViewTestWebContentsObserver : public content::WebContentsObserver { private: content::WebContents* web_contents_; bool was_shown_; - int32 shown_count_; - int32 hidden_count_; + int32_t shown_count_; + int32_t hidden_count_; // Set to true if the view containing the webcontents has a valid root window. bool valid_root_while_shown_; diff --git a/ui/views/corewm/cursor_height_provider_win.cc b/ui/views/corewm/cursor_height_provider_win.cc index f9d4f98..17a6f83 100644 --- a/ui/views/corewm/cursor_height_provider_win.cc +++ b/ui/views/corewm/cursor_height_provider_win.cc @@ -5,10 +5,11 @@ #include "ui/views/corewm/cursor_height_provider_win.h" #include <windows.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> #include <map> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/win/scoped_hdc.h" diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc index 0380f10..879cafc 100644 --- a/ui/views/corewm/desktop_capture_controller_unittest.cc +++ b/ui/views/corewm/desktop_capture_controller_unittest.cc @@ -5,6 +5,7 @@ #include "ui/wm/core/capture_controller.h" #include "base/logging.h" +#include "base/macros.h" #include "base/path_service.h" #include "ui/aura/env.h" #include "ui/aura/test/test_window_delegate.h" diff --git a/ui/views/corewm/tooltip_aura.cc b/ui/views/corewm/tooltip_aura.cc index fffcafb..060d434 100644 --- a/ui/views/corewm/tooltip_aura.cc +++ b/ui/views/corewm/tooltip_aura.cc @@ -4,6 +4,7 @@ #include "ui/views/corewm/tooltip_aura.h" +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "ui/aura/window.h" diff --git a/ui/views/corewm/tooltip_aura.h b/ui/views/corewm/tooltip_aura.h index d1ef448..a905fbb 100644 --- a/ui/views/corewm/tooltip_aura.h +++ b/ui/views/corewm/tooltip_aura.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_COREWM_TOOLTIP_AURA_H_ #define UI_VIEWS_COREWM_TOOLTIP_AURA_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/screen_type_delegate.h" #include "ui/views/corewm/tooltip.h" diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc index 305b0cf3..ca27ffd 100644 --- a/ui/views/corewm/tooltip_controller.cc +++ b/ui/views/corewm/tooltip_controller.cc @@ -4,11 +4,14 @@ #include "ui/views/corewm/tooltip_controller.h" +#include <stddef.h> + #include <utility> #include <vector> #include "base/strings/string_util.h" #include "base/time/time.h" +#include "build/build_config.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/screen_position_client.h" diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index 2c93f7a..ee42e72 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/timer/timer.h" diff --git a/ui/views/corewm/tooltip_controller_test_helper.h b/ui/views/corewm/tooltip_controller_test_helper.h index 60de9d7..af1bcb8 100644 --- a/ui/views/corewm/tooltip_controller_test_helper.h +++ b/ui/views/corewm/tooltip_controller_test_helper.h @@ -6,6 +6,7 @@ #define UI_VIEWS_COREWM_TOOLTIP_CONTROLLER_TEST_HELPER_H_ #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/views/view.h" #include "ui/views/views_export.h" diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index ad341d9..ca66322 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -4,7 +4,9 @@ #include "ui/views/corewm/tooltip_controller.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" diff --git a/ui/views/corewm/tooltip_win.h b/ui/views/corewm/tooltip_win.h index 9fac064..0b8ea61 100644 --- a/ui/views/corewm/tooltip_win.h +++ b/ui/views/corewm/tooltip_win.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_COREWM_TOOLTIP_WIN_H_ #define UI_VIEWS_COREWM_TOOLTIP_WIN_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/geometry/point.h" #include "ui/views/corewm/tooltip.h" diff --git a/ui/views/event_monitor_unittest.cc b/ui/views/event_monitor_unittest.cc index 4d8b02b..92b364c 100644 --- a/ui/views/event_monitor_unittest.cc +++ b/ui/views/event_monitor_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "ui/events/test/event_generator.h" #include "ui/events/test/test_event_handler.h" #include "ui/views/event_monitor.h" diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index 09cca52..597b7ad 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/bubble_example.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/label_button.h" diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h index eee0347..91e514d 100644 --- a/ui/views/examples/bubble_example.h +++ b/ui/views/examples/bubble_example.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_ +#include "base/macros.h" #include "ui/views/controls/button/button.h" #include "ui/views/examples/example_base.h" diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc index bb719f9..78ecfc1 100644 --- a/ui/views/examples/double_split_view_example.cc +++ b/ui/views/examples/double_split_view_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/double_split_view_example.h" +#include "base/macros.h" #include "ui/views/background.h" #include "ui/views/controls/single_split_view.h" #include "ui/views/layout/grid_layout.h" diff --git a/ui/views/examples/example_base.cc b/ui/views/examples/example_base.cc index d6477a0..2208bf6 100644 --- a/ui/views/examples/example_base.cc +++ b/ui/views/examples/example_base.cc @@ -6,6 +6,7 @@ #include <stdarg.h> +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "ui/views/view.h" diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index 70624fe..67ed52f 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -11,6 +11,7 @@ #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_device_source.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc index 8008979..c391b7e 100644 --- a/ui/views/examples/examples_window.cc +++ b/ui/views/examples/examples_window.cc @@ -8,6 +8,7 @@ #include <string> #include <utility> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/combobox_model.h" diff --git a/ui/views/examples/examples_with_content_main_exe.cc b/ui/views/examples/examples_with_content_main_exe.cc index 9dd98f4..ffbad7f 100644 --- a/ui/views/examples/examples_with_content_main_exe.cc +++ b/ui/views/examples/examples_with_content_main_exe.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "build/build_config.h" #include "content/public/browser/browser_context.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views_content_client/views_content_client.h" diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc index a496ba7..98ea080 100644 --- a/ui/views/examples/label_example.cc +++ b/ui/views/examples/label_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/label_example.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/views/background.h" diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc index 551de1b..effa3e7 100644 --- a/ui/views/examples/menu_example.cc +++ b/ui/views/examples/menu_example.cc @@ -6,6 +6,7 @@ #include <set> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/models/simple_menu_model.h" #include "ui/views/controls/button/menu_button.h" diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index b85d67d..5ce1a1b 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc @@ -4,6 +4,9 @@ #include "ui/views/examples/multiline_example.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/events/event.h" #include "ui/gfx/render_text.h" diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc index 5e3c7dd..38072ef 100644 --- a/ui/views/examples/radio_button_example.cc +++ b/ui/views/examples/radio_button_example.cc @@ -4,6 +4,9 @@ #include "ui/views/examples/radio_button_example.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/views/controls/button/label_button.h" diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index 08c3272..4fd1aaa 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/scroll_view_example.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "ui/views/background.h" diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc index 1824ccc..8f3deac 100644 --- a/ui/views/examples/single_split_view_example.cc +++ b/ui/views/examples/single_split_view_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/single_split_view_example.h" +#include "base/macros.h" #include "ui/views/background.h" #include "ui/views/controls/single_split_view.h" #include "ui/views/layout/grid_layout.h" diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index 8e295fb..878c910 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/text_example.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index 7dae434..f9b868e 100644 --- a/ui/views/examples/textfield_example.cc +++ b/ui/views/examples/textfield_example.cc @@ -4,6 +4,8 @@ #include "ui/views/examples/textfield_example.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "ui/events/event.h" #include "ui/gfx/range/range.h" diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc index 3333e5b..5a19812 100644 --- a/ui/views/examples/throbber_example.cc +++ b/ui/views/examples/throbber_example.cc @@ -4,6 +4,7 @@ #include "ui/views/examples/throbber_example.h" +#include "base/macros.h" #include "ui/views/controls/throbber.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" diff --git a/ui/views/examples/vector_example.cc b/ui/views/examples/vector_example.cc index a42a0d0..94f8972 100644 --- a/ui/views/examples/vector_example.cc +++ b/ui/views/examples/vector_example.cc @@ -4,10 +4,14 @@ #include "ui/views/examples/vector_example.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/vector_icons_public.h" #include "ui/views/border.h" diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index 3a9506f..bcfb451 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -4,7 +4,9 @@ #include "ui/views/examples/widget_example.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/views/background.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/label.h" diff --git a/ui/views/focus/external_focus_tracker.h b/ui/views/focus/external_focus_tracker.h index 3fec0fd..50f5ab7 100644 --- a/ui/views/focus/external_focus_tracker.h +++ b/ui/views/focus/external_focus_tracker.h @@ -6,6 +6,7 @@ #define UI_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/focus/focus_manager.h" namespace views { diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index ec405f8..6d5195e 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -8,7 +8,7 @@ #include <list> #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "ui/base/accelerators/accelerator.h" diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc index 7b16e2b..14956a6 100644 --- a/ui/views/focus/focus_manager_factory.cc +++ b/ui/views/focus/focus_manager_factory.cc @@ -5,6 +5,7 @@ #include "ui/views/focus/focus_manager_factory.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/focus/focus_manager.h" namespace views { diff --git a/ui/views/focus/focus_manager_factory.h b/ui/views/focus/focus_manager_factory.h index 6f13b24..ac90a7b 100644 --- a/ui/views/focus/focus_manager_factory.h +++ b/ui/views/focus/focus_manager_factory.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_FOCUS_FOCUS_MANAGER_FACTORY_H_ #define UI_VIEWS_FOCUS_FOCUS_MANAGER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/views_export.h" namespace views { diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index c903264..1c4f350 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -4,10 +4,13 @@ #include "ui/views/focus/focus_manager.h" +#include <stddef.h> + #include <utility> #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/keycodes/keyboard_codes.h" diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h index 76b367f..dd13918 100644 --- a/ui/views/focus/focus_search.h +++ b/ui/views/focus/focus_search.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_FOCUS_FOCUS_SEARCH_H_ #define UI_VIEWS_FOCUS_FOCUS_SEARCH_H_ +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc index 79e22ef..f1bee54 100644 --- a/ui/views/focus/focus_traversal_unittest.cc +++ b/ui/views/focus/focus_traversal_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/focus/focus_manager.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/views/focus/view_storage.h b/ui/views/focus/view_storage.h index f0f00b3..d543415 100644 --- a/ui/views/focus/view_storage.h +++ b/ui/views/focus/view_storage.h @@ -5,10 +5,12 @@ #ifndef UI_VIEWS_FOCUS_VIEW_STORAGE_H_ #define UI_VIEWS_FOCUS_VIEW_STORAGE_H_ +#include <stddef.h> + #include <map> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/views_export.h" namespace base { diff --git a/ui/views/focus/widget_focus_manager.h b/ui/views/focus/widget_focus_manager.h index 1a25b6d..deaaab4 100644 --- a/ui/views/focus/widget_focus_manager.h +++ b/ui/views/focus/widget_focus_manager.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_ #define UI_VIEWS_FOCUS_WIDGET_FOCUS_MANAGER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/views_export.h" diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h index 0a82bb4..dcf002e 100644 --- a/ui/views/layout/box_layout.h +++ b/ui/views/layout/box_layout.h @@ -7,8 +7,8 @@ #include <map> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/layout/layout_manager.h" diff --git a/ui/views/layout/box_layout_unittest.cc b/ui/views/layout/box_layout_unittest.cc index 59866b1..0ef2fba 100644 --- a/ui/views/layout/box_layout_unittest.cc +++ b/ui/views/layout/box_layout_unittest.cc @@ -4,6 +4,8 @@ #include "ui/views/layout/box_layout.h" +#include <stddef.h> + #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/test/test_views.h" #include "ui/views/view.h" diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h index 412fc53..11a5683 100644 --- a/ui/views/layout/fill_layout.h +++ b/ui/views/layout/fill_layout.h @@ -6,6 +6,7 @@ #define UI_VIEWS_LAYOUT_FILL_LAYOUT_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/layout/layout_manager.h" #include "ui/views/view.h" diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 5cf9197..c79b600 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/stl_util.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/view.h" diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h index 671a2c6..856fb6f 100644 --- a/ui/views/layout/grid_layout.h +++ b/ui/views/layout/grid_layout.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ #define UI_VIEWS_LAYOUT_GRID_LAYOUT_H_ +#include <stddef.h> + #include <vector> #include "base/macros.h" diff --git a/ui/views/linux_ui/window_button_order_provider.cc b/ui/views/linux_ui/window_button_order_provider.cc index 22b8ffd..4bbc0c4 100644 --- a/ui/views/linux_ui/window_button_order_provider.cc +++ b/ui/views/linux_ui/window_button_order_provider.cc @@ -4,6 +4,7 @@ #include "ui/views/window/window_button_order_provider.h" +#include "base/macros.h" #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/linux_ui/window_button_order_observer.h" diff --git a/ui/views/masked_targeter_delegate.h b/ui/views/masked_targeter_delegate.h index 55ac3b3..ec56d34 100644 --- a/ui/views/masked_targeter_delegate.h +++ b/ui/views/masked_targeter_delegate.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_MASKED_TARGETER_DELEGATE_H_ #define UI_VIEWS_MASKED_TARGETER_DELEGATE_H_ +#include "base/macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/view_targeter_delegate.h" #include "ui/views/views_export.h" diff --git a/ui/views/metrics_aura.cc b/ui/views/metrics_aura.cc index 046baa8..50102ca 100644 --- a/ui/views/metrics_aura.cc +++ b/ui/views/metrics_aura.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" #include "ui/views/metrics.h" #if defined(OS_WIN) diff --git a/ui/views/mouse_constants.h b/ui/views/mouse_constants.h index a0dce80..9545a02 100644 --- a/ui/views/mouse_constants.h +++ b/ui/views/mouse_constants.h @@ -5,7 +5,6 @@ #ifndef UI_VIEWS_MOUSE_CONSTANTS_H_ #define UI_VIEWS_MOUSE_CONSTANTS_H_ -#include "base/basictypes.h" namespace views { diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc index 00e6364..c28005f 100644 --- a/ui/views/mouse_watcher.cc +++ b/ui/views/mouse_watcher.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/event_types.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "ui/events/event.h" diff --git a/ui/views/mouse_watcher.h b/ui/views/mouse_watcher.h index 592266a..89e1358 100644 --- a/ui/views/mouse_watcher.h +++ b/ui/views/mouse_watcher.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_MOUSE_WATCHER_H_ #define UI_VIEWS_MOUSE_WATCHER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "ui/gfx/geometry/insets.h" diff --git a/ui/views/mouse_watcher_view_host.h b/ui/views/mouse_watcher_view_host.h index 6afe791..06464e1 100644 --- a/ui/views/mouse_watcher_view_host.h +++ b/ui/views/mouse_watcher_view_host.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_MOUSE_WATCHER_VIEW_HOST_H_ #define UI_VIEWS_MOUSE_WATCHER_VIEW_HOST_H_ +#include "base/macros.h" #include "ui/views/mouse_watcher.h" namespace views { diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc index 54f621a..8050d00 100644 --- a/ui/views/mus/aura_init.cc +++ b/ui/views/mus/aura_init.cc @@ -7,7 +7,9 @@ #include <utility> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/path_service.h" +#include "build/build_config.h" #include "components/resource_provider/public/cpp/resource_loader.h" #include "mojo/application/public/cpp/application_impl.h" #include "ui/aura/env.h" diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h index 0b16cb9..bff0171 100644 --- a/ui/views/mus/aura_init.h +++ b/ui/views/mus/aura_init.h @@ -9,6 +9,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "skia/ext/refptr.h" #include "ui/views/mus/mus_export.h" diff --git a/ui/views/mus/display_converter.cc b/ui/views/mus/display_converter.cc index 954aad7..fce58f6 100644 --- a/ui/views/mus/display_converter.cc +++ b/ui/views/mus/display_converter.cc @@ -4,13 +4,15 @@ #include "ui/views/mus/display_converter.h" +#include <stdint.h> + #include "components/mus/public/cpp/window.h" #include "mojo/converters/geometry/geometry_type_converters.h" namespace views { std::vector<gfx::Display> GetDisplaysFromWindow(mus::Window* window) { - static int64 synthesized_display_id = 2000; + static int64_t synthesized_display_id = 2000; gfx::Display display; display.set_id(synthesized_display_id++); display.SetScaleAndBounds( diff --git a/ui/views/mus/input_method_mus.h b/ui/views/mus/input_method_mus.h index fe9ab13..e5188a3 100644 --- a/ui/views/mus/input_method_mus.h +++ b/ui/views/mus/input_method_mus.h @@ -7,6 +7,7 @@ #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ +#include "base/macros.h" #include "ui/views/mus/mus_export.h" namespace mus { diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc index 819f5d7..cc3ebc4 100644 --- a/ui/views/mus/native_widget_mus.cc +++ b/ui/views/mus/native_widget_mus.cc @@ -4,6 +4,7 @@ #include "ui/views/mus/native_widget_mus.h" +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "components/mus/public/cpp/property_type_converters.h" #include "components/mus/public/cpp/window.h" diff --git a/ui/views/mus/native_widget_mus.h b/ui/views/mus/native_widget_mus.h index bf973b5..b05d49e 100644 --- a/ui/views/mus/native_widget_mus.h +++ b/ui/views/mus/native_widget_mus.h @@ -5,9 +5,12 @@ #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ +#include <stdint.h> + #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "components/mus/public/interfaces/window_manager.mojom.h" diff --git a/ui/views/mus/platform_window_mus.cc b/ui/views/mus/platform_window_mus.cc index e311e2e..3683cf5 100644 --- a/ui/views/mus/platform_window_mus.cc +++ b/ui/views/mus/platform_window_mus.cc @@ -4,6 +4,7 @@ #include "ui/views/mus/platform_window_mus.h" +#include "build/build_config.h" #include "components/mus/public/cpp/property_type_converters.h" #include "components/mus/public/cpp/window_property.h" #include "components/mus/public/interfaces/window_manager.mojom.h" diff --git a/ui/views/mus/platform_window_mus.h b/ui/views/mus/platform_window_mus.h index 3f13aac..d98f2d2 100644 --- a/ui/views/mus/platform_window_mus.h +++ b/ui/views/mus/platform_window_mus.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ #define UI_VIEWS_MUS_PLATFORM_WINDOW_MUS_H_ +#include <stdint.h> + #include <string> #include <vector> diff --git a/ui/views/mus/surface_binding.cc b/ui/views/mus/surface_binding.cc index f42aabb..e7568da 100644 --- a/ui/views/mus/surface_binding.cc +++ b/ui/views/mus/surface_binding.cc @@ -4,11 +4,14 @@ #include "ui/views/mus/surface_binding.h" +#include <stdint.h> + #include <map> #include <utility> #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/threading/thread_local.h" #include "cc/output/compositor_frame.h" #include "cc/output/output_surface.h" diff --git a/ui/views/mus/surface_binding.h b/ui/views/mus/surface_binding.h index 1adab1a..0b468b5 100644 --- a/ui/views/mus/surface_binding.h +++ b/ui/views/mus/surface_binding.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_MUS_SURFACE_BINDING_H_ #define UI_VIEWS_MUS_SURFACE_BINDING_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/window_tree.mojom.h" diff --git a/ui/views/mus/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc index 362d39c..f83de28 100644 --- a/ui/views/mus/surface_context_factory.cc +++ b/ui/views/mus/surface_context_factory.cc @@ -66,8 +66,8 @@ bool SurfaceContextFactory::DoesCreateTestContexts() { return false; } -uint32 SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format, - gfx::BufferUsage usage) { +uint32_t SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format, + gfx::BufferUsage usage) { // No GpuMemoryBuffer support, so just return GL_TEXTURE_2D. return GL_TEXTURE_2D; } diff --git a/ui/views/mus/surface_context_factory.h b/ui/views/mus/surface_context_factory.h index 8cc6117..72c85fd 100644 --- a/ui/views/mus/surface_context_factory.h +++ b/ui/views/mus/surface_context_factory.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_ #define UI_VIEWS_MUS_SURFACE_CONTEXT_FACTORY_H_ +#include <stdint.h> + +#include "base/macros.h" #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" #include "components/mus/gles2/raster_thread_helper.h" #include "components/mus/public/interfaces/window_tree.mojom.h" @@ -39,8 +42,8 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory { scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; void RemoveCompositor(ui::Compositor* compositor) override; bool DoesCreateTestContexts() override; - uint32 GetImageTextureTarget(gfx::BufferFormat format, - gfx::BufferUsage usage) override; + uint32_t GetImageTextureTarget(gfx::BufferFormat format, + gfx::BufferUsage usage) override; cc::SharedBitmapManager* GetSharedBitmapManager() override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; cc::TaskGraphRunner* GetTaskGraphRunner() override; diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h index 4e15c6a..c9bf4cc 100644 --- a/ui/views/mus/window_manager_connection.h +++ b/ui/views/mus/window_manager_connection.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/mus/public/cpp/window_tree_delegate.h" #include "components/mus/public/interfaces/window_manager.mojom.h" diff --git a/ui/views/painter.cc b/ui/views/painter.cc index 42db547..0cc1f0d 100644 --- a/ui/views/painter.cc +++ b/ui/views/painter.cc @@ -5,6 +5,7 @@ #include "ui/views/painter.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/painter.h b/ui/views/painter.h index 14831b7..d75688e 100644 --- a/ui/views/painter.h +++ b/ui/views/painter.h @@ -5,8 +5,10 @@ #ifndef UI_VIEWS_PAINTER_H_ #define UI_VIEWS_PAINTER_H_ -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/nine_image_painter_factory.h" diff --git a/ui/views/repeat_controller.h b/ui/views/repeat_controller.h index 9eb412e..5eef959 100644 --- a/ui/views/repeat_controller.h +++ b/ui/views/repeat_controller.h @@ -6,6 +6,7 @@ #define UI_VIEWS_REPEAT_CONTROLLER_H_ #include "base/callback.h" +#include "base/macros.h" #include "base/timer/timer.h" namespace views { diff --git a/ui/views/round_rect_painter.h b/ui/views/round_rect_painter.h index 564cfa0..f52624a 100644 --- a/ui/views/round_rect_painter.h +++ b/ui/views/round_rect_painter.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_ROUNDED_RECT_PAINTER_H_ #define UI_VIEWS_ROUNDED_RECT_PAINTER_H_ +#include "base/macros.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/painter.h" #include "ui/views/views_export.h" diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 6983bd6..d901231 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" diff --git a/ui/views/shadow_border.h b/ui/views/shadow_border.h index afe4b64..0c05d66 100644 --- a/ui/views/shadow_border.h +++ b/ui/views/shadow_border.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_SHADOW_BORDER_H_ #define UI_VIEWS_SHADOW_BORDER_H_ +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/shadow_value.h" #include "ui/views/border.h" diff --git a/ui/views/style/mac/dialog_button_border_mac_unittest.cc b/ui/views/style/mac/dialog_button_border_mac_unittest.cc index 3b8b30e..471715b 100644 --- a/ui/views/style/mac/dialog_button_border_mac_unittest.cc +++ b/ui/views/style/mac/dialog_button_border_mac_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/style/mac/dialog_button_border_mac.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/compositor/canvas_painter.h" diff --git a/ui/views/style/platform_style.cc b/ui/views/style/platform_style.cc index 7fbe022..866a1ca 100644 --- a/ui/views/style/platform_style.cc +++ b/ui/views/style/platform_style.cc @@ -4,6 +4,7 @@ #include "ui/views/style/platform_style.h" +#include "build/build_config.h" #include "ui/base/resource/material_design/material_design_controller.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button_border.h" diff --git a/ui/views/test/capture_tracking_view.h b/ui/views/test/capture_tracking_view.h index acbc305..d5dcfbe 100644 --- a/ui/views/test/capture_tracking_view.h +++ b/ui/views/test/capture_tracking_view.h @@ -6,6 +6,7 @@ #define UI_VIEWS_TEST_CAPTURE_TRACKING_VIEW_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/view.h" namespace views { diff --git a/ui/views/test/combobox_test_api.cc b/ui/views/test/combobox_test_api.cc index 57a5bdb..5a897be 100644 --- a/ui/views/test/combobox_test_api.cc +++ b/ui/views/test/combobox_test_api.cc @@ -4,6 +4,9 @@ #include "ui/views/test/combobox_test_api.h" +#include <stdint.h> + +#include "base/macros.h" #include "ui/base/models/menu_model.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/menu/menu_runner.h" @@ -25,7 +28,7 @@ class TestMenuRunnerHandler : public MenuRunnerHandler { const gfx::Rect& bounds, MenuAnchorPosition anchor, ui::MenuSourceType source_type, - int32 types) override { + int32_t types) override { *show_counter_ += 1; return MenuRunner::NORMAL_EXIT; } diff --git a/ui/views/test/desktop_test_views_delegate.h b/ui/views/test/desktop_test_views_delegate.h index 3c3d301..91b91b1 100644 --- a/ui/views/test/desktop_test_views_delegate.h +++ b/ui/views/test/desktop_test_views_delegate.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_DESKTOP_TEST_VIEWS_DELEGATE_H_ #define UI_VIEWS_TEST_DESKTOP_TEST_VIEWS_DELEGATE_H_ +#include "base/macros.h" #include "ui/views/test/test_views_delegate.h" namespace views { diff --git a/ui/views/test/desktop_test_views_delegate_aura.cc b/ui/views/test/desktop_test_views_delegate_aura.cc index 96f6391..5ef8f88 100644 --- a/ui/views/test/desktop_test_views_delegate_aura.cc +++ b/ui/views/test/desktop_test_views_delegate_aura.cc @@ -4,6 +4,7 @@ #include "ui/views/test/desktop_test_views_delegate.h" +#include "build/build_config.h" #include "ui/views/widget/native_widget_aura.h" #if !defined(OS_CHROMEOS) diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm index 74c3edc..a46bced 100644 --- a/ui/views/test/event_generator_delegate_mac.mm +++ b/ui/views/test/event_generator_delegate_mac.mm @@ -3,9 +3,11 @@ // found in the LICENSE file. #import <Cocoa/Cocoa.h> +#include <stddef.h> #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "ui/events/event_processor.h" #include "ui/events/event_target.h" diff --git a/ui/views/test/focus_manager_test.h b/ui/views/test/focus_manager_test.h index d601b3f..fb2a292 100644 --- a/ui/views/test/focus_manager_test.h +++ b/ui/views/test/focus_manager_test.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_ #define UI_VIEWS_TEST_FOCUS_MANAGER_TEST_H_ +#include "base/macros.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/focus/widget_focus_manager.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/test/menu_runner_test_api.h b/ui/views/test/menu_runner_test_api.h index a9e2b8e..a99287c 100644 --- a/ui/views/test/menu_runner_test_api.h +++ b/ui/views/test/menu_runner_test_api.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_TEST_MENU_RUNNER_TEST_API_H_ #define UI_VIEWS_TEST_MENU_RUNNER_TEST_API_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace views { diff --git a/ui/views/test/slider_test_api.h b/ui/views/test/slider_test_api.h index 749ff4e..7ee8547 100644 --- a/ui/views/test/slider_test_api.h +++ b/ui/views/test/slider_test_api.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_TEST_SLIDER_TEST_API_H_ #define UI_VIEWS_TEST_SLIDER_TEST_API_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace views { diff --git a/ui/views/test/test_views.h b/ui/views/test/test_views.h index 28cc276..a7230ab 100644 --- a/ui/views/test/test_views.h +++ b/ui/views/test/test_views.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_TEST_VIEWS_H_ #define UI_VIEWS_TEST_TEST_VIEWS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/events/event_constants.h" #include "ui/views/view.h" diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h index 022da9a..81e466b 100644 --- a/ui/views/test/test_views_delegate.h +++ b/ui/views/test/test_views_delegate.h @@ -5,7 +5,9 @@ #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "ui/views/views_delegate.h" namespace wm { diff --git a/ui/views/test/test_views_delegate_aura.cc b/ui/views/test/test_views_delegate_aura.cc index ccd2bb2..db32fd1 100644 --- a/ui/views/test/test_views_delegate_aura.cc +++ b/ui/views/test/test_views_delegate_aura.cc @@ -4,6 +4,7 @@ #include "ui/views/test/test_views_delegate.h" +#include "build/build_config.h" #include "ui/aura/env.h" #include "ui/wm/core/wm_state.h" diff --git a/ui/views/test/test_widget_observer.h b/ui/views/test/test_widget_observer.h index fc3e8ec..5580bb6 100644 --- a/ui/views/test/test_widget_observer.h +++ b/ui/views/test/test_widget_observer.h @@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/widget/widget_observer.h" namespace views { diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc index 7e52286..6ead2eb 100644 --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc @@ -12,6 +12,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/macros.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/env.h" #include "ui/aura/test/aura_test_utils.h" diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h index b59ebf4..d3733b6 100644 --- a/ui/views/test/views_test_base.h +++ b/ui/views/test/views_test_base.h @@ -5,8 +5,10 @@ #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/views/test/scoped_views_test_helper.h" diff --git a/ui/views/test/views_test_helper.h b/ui/views/test/views_test_helper.h index 8d73333..8f16c56 100644 --- a/ui/views/test/views_test_helper.h +++ b/ui/views/test/views_test_helper.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" namespace base { diff --git a/ui/views/test/views_test_helper_mac.h b/ui/views/test/views_test_helper_mac.h index 1fa8c89..31fc0d8 100644 --- a/ui/views/test/views_test_helper_mac.h +++ b/ui/views/test/views_test_helper_mac.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_ #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/test/views_test_helper.h" diff --git a/ui/views/test/webview_test_helper.h b/ui/views/test/webview_test_helper.h index c0fbdbf..1c692a9 100644 --- a/ui/views/test/webview_test_helper.h +++ b/ui/views/test/webview_test_helper.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_ #define UI_VIEWS_TEST_WEB_VIEW_TEST_HELPER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace base { diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc index 66cf6e5..b0db3dd 100644 --- a/ui/views/test/widget_test.cc +++ b/ui/views/test/widget_test.cc @@ -4,6 +4,7 @@ #include "ui/views/test/widget_test.h" +#include "build/build_config.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/widget/root_view.h" diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h index fc7d0b5..e1eeb76 100644 --- a/ui/views/test/widget_test.h +++ b/ui/views/test/widget_test.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_TEST_WIDGET_TEST_H_ #define UI_VIEWS_TEST_WIDGET_TEST_H_ +#include "base/macros.h" +#include "build/build_config.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ui/views/test/widget_test_aura.cc b/ui/views/test/widget_test_aura.cc index 502d7d0..0a76030 100644 --- a/ui/views/test/widget_test_aura.cc +++ b/ui/views/test/widget_test_aura.cc @@ -4,6 +4,7 @@ #include "ui/views/test/widget_test.h" +#include "build/build_config.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/ui/views/test/widget_test_mac.mm b/ui/views/test/widget_test_mac.mm index 628655f..a4e1345 100644 --- a/ui/views/test/widget_test_mac.mm +++ b/ui/views/test/widget_test_mac.mm @@ -8,6 +8,7 @@ #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" +#include "base/macros.h" #import "ui/views/cocoa/bridged_native_widget.h" #include "ui/views/widget/root_view.h" diff --git a/ui/views/test/x11_property_change_waiter.h b/ui/views/test/x11_property_change_waiter.h index 506b486..823813b 100644 --- a/ui/views/test/x11_property_change_waiter.h +++ b/ui/views/test/x11_property_change_waiter.h @@ -5,7 +5,10 @@ #ifndef UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ +#include <stdint.h> + #include "base/callback.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/events/platform/platform_event_types.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 3a26e61..c0e4ef9 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -4,6 +4,7 @@ #include "ui/views/touchui/touch_selection_controller_impl.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h" #include "ui/aura/client/cursor_client.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index d7ff087..006b897 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h @@ -5,6 +5,7 @@ #ifndef UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_ #define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_ +#include "base/macros.h" #include "base/timer/timer.h" #include "ui/aura/window_observer.h" #include "ui/base/touch/selection_bound.h" diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 8b668c7..06ab5f4 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -2,7 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/test/test_cursor_client.h" diff --git a/ui/views/touchui/touch_selection_menu_runner_views.cc b/ui/views/touchui/touch_selection_menu_runner_views.cc index 99d9856..d5928a3 100644 --- a/ui/views/touchui/touch_selection_menu_runner_views.cc +++ b/ui/views/touchui/touch_selection_menu_runner_views.cc @@ -4,6 +4,9 @@ #include "ui/views/touchui/touch_selection_menu_runner_views.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc b/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc index 424f82c..9a557b2 100644 --- a/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc +++ b/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "ui/events/event_utils.h" #include "ui/strings/grit/ui_strings.h" #include "ui/touch_selection/touch_selection_menu_runner.h" diff --git a/ui/views/view.cc b/ui/views/view.cc index e085544..fc2d03e 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -11,12 +11,14 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/accessibility/ax_enums.h" #include "ui/base/cursor/cursor.h" diff --git a/ui/views/view.h b/ui/views/view.h index ec070e5..a6248de 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -5,6 +5,8 @@ #ifndef UI_VIEWS_VIEW_H_ #define UI_VIEWS_VIEW_H_ +#include <stddef.h> + #include <algorithm> #include <map> #include <set> @@ -14,6 +16,7 @@ #include "base/compiler_specific.h" #include "base/i18n/rtl.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "ui/accessibility/ax_enums.h" diff --git a/ui/views/view_model.cc b/ui/views/view_model.cc index 14f60e0..b0e49c2 100644 --- a/ui/views/view_model.cc +++ b/ui/views/view_model.cc @@ -4,6 +4,8 @@ #include "ui/views/view_model.h" +#include <stddef.h> + #include "base/logging.h" #include "ui/views/view.h" diff --git a/ui/views/view_model.h b/ui/views/view_model.h index 22c8d7e..47a3808 100644 --- a/ui/views/view_model.h +++ b/ui/views/view_model.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/views_export.h" diff --git a/ui/views/view_model_utils.h b/ui/views/view_model_utils.h index a01fecb..7bd2f20 100644 --- a/ui/views/view_model_utils.h +++ b/ui/views/view_model_utils.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_VIEW_MODEL_UTILS_H_ #define UI_VIEWS_VIEW_MODEL_UTILS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/views_export.h" namespace views { diff --git a/ui/views/view_targeter_unittest.cc b/ui/views/view_targeter_unittest.cc index ad61c17..33a2372 100644 --- a/ui/views/view_targeter_unittest.cc +++ b/ui/views/view_targeter_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/view_targeter.h" +#include "base/macros.h" #include "ui/events/event_targeter.h" #include "ui/events/event_utils.h" #include "ui/gfx/path.h" diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 503eead..4ea748e 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -2,14 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <map> #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "cc/playback/display_item_list.h" #include "cc/playback/display_item_list_settings.h" #include "ui/base/accelerators/accelerator.h" diff --git a/ui/views/views_delegate.cc b/ui/views/views_delegate.cc index a6ce9cc..082f2f1 100644 --- a/ui/views/views_delegate.cc +++ b/ui/views/views_delegate.cc @@ -5,6 +5,7 @@ #include "ui/views/views_delegate.h" #include "base/command_line.h" +#include "build/build_config.h" #include "ui/views/views_touch_selection_controller_factory.h" #include "ui/views/widget/native_widget_private.h" diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h index 16ecca0..c0e24cf 100644 --- a/ui/views/views_delegate.h +++ b/ui/views/views_delegate.h @@ -13,7 +13,9 @@ #include "base/callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "ui/accessibility/ax_enums.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/views/views_switches.cc b/ui/views/views_switches.cc index 8690ec0..9fa09fc 100644 --- a/ui/views/views_switches.cc +++ b/ui/views/views_switches.cc @@ -5,6 +5,7 @@ #include "ui/views/views_switches.h" #include "base/command_line.h" +#include "build/build_config.h" namespace views { namespace switches { diff --git a/ui/views/widget/android/native_widget_android.cc b/ui/views/widget/android/native_widget_android.cc index b069355..f7b85f1 100644 --- a/ui/views/widget/android/native_widget_android.cc +++ b/ui/views/widget/android/native_widget_android.cc @@ -5,6 +5,7 @@ #include "ui/views/widget/android/native_widget_android.h" #include "base/bind.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "third_party/skia/include/core/SkRegion.h" diff --git a/ui/views/widget/desktop_aura/desktop_capture_client.h b/ui/views/widget/desktop_aura/desktop_capture_client.h index 6c5ce7b..93be84a 100644 --- a/ui/views/widget/desktop_aura/desktop_capture_client.h +++ b/ui/views/widget/desktop_aura/desktop_capture_client.h @@ -7,8 +7,8 @@ #include <set> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/aura/client/capture_client.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc index fc16eaa..11fc3f1 100644 --- a/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc +++ b/ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc @@ -4,6 +4,9 @@ #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h" +#include <stddef.h> + +#include "base/macros.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/cursor/cursor_loader.h" #include "ui/base/cursor/cursors_aura.h" diff --git a/ui/views/widget/desktop_aura/desktop_dispatcher_client.cc b/ui/views/widget/desktop_aura/desktop_dispatcher_client.cc index 4b8ca2d..409057d 100644 --- a/ui/views/widget/desktop_aura/desktop_dispatcher_client.cc +++ b/ui/views/widget/desktop_aura/desktop_dispatcher_client.cc @@ -7,6 +7,7 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/run_loop.h" +#include "build/build_config.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h index a459f77..3d7f6f4 100644 --- a/ui/views/widget/desktop_aura/desktop_dispatcher_client.h +++ b/ui/views/widget/desktop_aura/desktop_dispatcher_client.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DISPATCHER_CLIENT_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DISPATCHER_CLIENT_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "ui/views/views_export.h" #include "ui/wm/public/dispatcher_client.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc index 5a76cbf..3ef11e8 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc @@ -4,10 +4,13 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" +#include <stddef.h> +#include <stdint.h> #include <X11/Xatom.h> #include "base/event_types.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -121,7 +124,7 @@ const int kRepeatMouseMoveTimeoutMs = 350; // The minimum alpha before we declare a pixel transparent when searching in // our source image. -const uint32 kMinAlpha = 32; +const uint32_t kMinAlpha = 32; // |drag_widget_|'s opacity. const unsigned char kDragWidgetOpacity = 0xc0; @@ -1213,7 +1216,7 @@ bool DesktopDragDropClientAuraX11::IsValidDragImage( const SkBitmap* in_bitmap = image.bitmap(); SkAutoLockPixels in_lock(*in_bitmap); for (int y = 0; y < in_bitmap->height(); ++y) { - uint32* in_row = in_bitmap->getAddr32(0, y); + uint32_t* in_row = in_bitmap->getAddr32(0, y); for (int x = 0; x < in_bitmap->width(); ++x) { if (SkColorGetA(in_row[x]) > kMinAlpha) diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h index 8b040ca..65dc403 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h @@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc index 61dd76d..29105c2 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc @@ -9,6 +9,7 @@ // conflicts with the definition of None in gtest-type-util.h #include "ui/views/test/views_test_base.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h index 4cc0e8a..ce506e7 100644 --- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h +++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h @@ -8,6 +8,7 @@ #include <wrl/client.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.h b/ui/views/widget/desktop_aura/desktop_drop_target_win.h index 73dc15f..24059b6 100644 --- a/ui/views/widget/desktop_aura/desktop_drop_target_win.h +++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTIOP_DROP_TARGET_WIN_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTIOP_DROP_TARGET_WIN_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/drop_target_win.h" diff --git a/ui/views/widget/desktop_aura/desktop_event_client.h b/ui/views/widget/desktop_aura/desktop_event_client.h index 3d5733b..f98bb9a 100644 --- a/ui/views/widget/desktop_aura/desktop_event_client.h +++ b/ui/views/widget/desktop_aura/desktop_event_client.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_EVENT_CLIENT_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_EVENT_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/aura/client/event_client.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.h b/ui/views/widget/desktop_aura/desktop_focus_rules.h index 21d952a..dd21dc9 100644 --- a/ui/views/widget/desktop_aura/desktop_focus_rules.h +++ b/ui/views/widget/desktop_aura/desktop_focus_rules.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_ #define UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_ +#include "base/macros.h" #include "ui/wm/core/base_focus_rules.h" namespace views { diff --git a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h index 9780f15..552a1b8 100644 --- a/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h +++ b/ui/views/widget/desktop_aura/desktop_native_cursor_manager.h @@ -8,6 +8,7 @@ #include <set> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/views_export.h" #include "ui/wm/core/native_cursor_manager.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index ba42e96..3cda119 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -5,7 +5,9 @@ #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "base/bind.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/focus_client.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h index cb01adf..6004090 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc index b2d301d..9578951 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc @@ -5,6 +5,8 @@ #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" #include "base/bind.h" +#include "base/macros.h" +#include "build/build_config.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/client/window_tree_client.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_position_client.h b/ui/views/widget/desktop_aura/desktop_screen_position_client.h index 6b563c0..2e7bb1b 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_position_client.h +++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_ +#include "base/macros.h" #include "ui/views/views_export.h" #include "ui/wm/core/default_screen_position_client.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.h b/ui/views/widget/desktop_aura/desktop_screen_win.h index 16357a3..8add5bd 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_win.h +++ b/ui/views/widget/desktop_aura/desktop_screen_win.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_WIN_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_WIN_H_ +#include "base/macros.h" #include "ui/gfx/screen_win.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc index 1ad719c..07bcfca 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc @@ -34,7 +34,7 @@ namespace { // The delay to perform configuration after RRNotify. See the comment // in |Dispatch()|. -const int64 kConfigureDelayMs = 500; +const int64_t kConfigureDelayMs = 500; double GetDeviceScaleFactor() { float device_scale_factor = 1.0f; @@ -309,8 +309,8 @@ std::vector<gfx::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() { gfx::XObjectDeleter<XRRCrtcInfo, void, XRRFreeCrtcInfo>> crtc(XRRGetCrtcInfo(xdisplay_, resources.get(), output_info->crtc)); - int64 display_id = -1; - if (!ui::GetDisplayId(output_id, static_cast<uint8>(i), &display_id)) { + int64_t display_id = -1; + if (!ui::GetDisplayId(output_id, static_cast<uint8_t>(i), &display_id)) { // It isn't ideal, but if we can't parse the EDID data, fallback on the // display number. display_id = i; diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.h b/ui/views/widget/desktop_aura/desktop_screen_x11.h index 74e373a..c49d4da 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11.h +++ b/ui/views/widget/desktop_aura/desktop_screen_x11.h @@ -5,6 +5,9 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/timer/timer.h" #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/gfx/display_change_notifier.h" diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc index 466bb79..c527545 100644 --- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc @@ -4,6 +4,9 @@ #include "ui/views/widget/desktop_aura/desktop_screen_x11.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h" @@ -48,8 +51,8 @@ class TestDesktopNativeWidgetAura : public views::DesktopNativeWidgetAura { namespace views { -const int64 kFirstDisplay = 5321829; -const int64 kSecondDisplay = 928310; +const int64_t kFirstDisplay = 5321829; +const int64_t kSecondDisplay = 928310; class DesktopScreenX11Test : public views::ViewsTestBase, public gfx::DisplayObserver { diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h index 363c019..bee915a 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WIN_H_ +#include "base/macros.h" #include "ui/aura/window_tree_host.h" #include "ui/views/views_export.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 8fa9049..2400b18 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -11,7 +11,6 @@ #include <X11/extensions/shape.h> #include <utility> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h index c6d9257..2d4d294 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -5,12 +5,14 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ +#include <stddef.h> +#include <stdint.h> #include <X11/extensions/shape.h> #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "base/basictypes.h" #include "base/cancelable_callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "ui/aura/scoped_window_targeter.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc index de08e7d..7ea716c 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc @@ -10,6 +10,7 @@ #undef Bool #undef None +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "ui/aura/env.h" diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc index 7c1a0e6..162cf3c 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc @@ -4,6 +4,7 @@ #include <vector> +#include <stddef.h> #include <X11/extensions/shape.h> #include <X11/Xlib.h> @@ -15,6 +16,7 @@ #undef None #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "ui/aura/window.h" diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.h b/ui/views/widget/desktop_aura/x11_desktop_handler.h index 48072e8..947040e 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_handler.h +++ b/ui/views/widget/desktop_aura/x11_desktop_handler.h @@ -5,12 +5,14 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ +#include <stdint.h> #include <X11/Xlib.h> // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. #undef RootWindow #include <vector> +#include "base/macros.h" #include "ui/aura/env_observer.h" #include "ui/events/platform/platform_event_dispatcher.h" #include "ui/gfx/x/x11_atom_cache.h" diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder.cc b/ui/views/widget/desktop_aura/x11_topmost_window_finder.cc index d5dbd55..092ba69d 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder.cc +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder.cc @@ -4,6 +4,7 @@ #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" +#include <stddef.h> #include <X11/Xutil.h> #include "ui/aura/client/screen_position_client.h" diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h index 5e3567a..8089dc0 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder.h +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder.h @@ -7,6 +7,7 @@ #include <set> +#include "base/macros.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/geometry/point.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc index b1d8747..f5343ad 100644 --- a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc +++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc @@ -4,16 +4,18 @@ #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h" -#include <algorithm> -#include <vector> +#include <stddef.h> #include <X11/extensions/shape.h> #include <X11/Xlib.h> #include <X11/Xregion.h> +#include <algorithm> +#include <vector> // Get rid of X11 macros which conflict with gtest. #undef Bool #undef None +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc index 1f432ca..a33f12f 100644 --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc @@ -4,11 +4,13 @@ #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h" -#include <X11/Xlib.h> +#include <stddef.h> #include <X11/keysym.h> +#include <X11/Xlib.h> #include <utility> #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/aura/client/capture_client.h" diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h index 742d5f4..24a9099 100644 --- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h +++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h @@ -5,8 +5,11 @@ #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ +#include <stdint.h> + #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/base/cursor/cursor.h" #include "ui/events/platform/platform_event_dispatcher.h" diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h index 932cf2db..2b80c8b 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.h +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h @@ -8,6 +8,7 @@ #include <X11/Xlib.h> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "ui/events/event_handler.h" #include "ui/gfx/x/x11_atom_cache.h" diff --git a/ui/views/widget/drop_helper.cc b/ui/views/widget/drop_helper.cc index bc9f394..540301a 100644 --- a/ui/views/widget/drop_helper.cc +++ b/ui/views/widget/drop_helper.cc @@ -4,6 +4,7 @@ #include "ui/views/widget/drop_helper.h" +#include "build/build_config.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/drop_helper.h b/ui/views/widget/drop_helper.h index 9247e1e..4e740aa 100644 --- a/ui/views/widget/drop_helper.h +++ b/ui/views/widget/drop_helper.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_WIDGET_DROP_HELPER_H_ #define UI_VIEWS_WIDGET_DROP_HELPER_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace gfx { class Point; diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 51be149..7c579d1 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index 2d88dad..247b3e1 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_delegate.h" diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index 5d001b9..f10981f 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -4,8 +4,8 @@ #include "ui/views/widget/native_widget_aura.h" -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/views/widget/native_widget_mac.h b/ui/views/widget/native_widget_mac.h index b2ed632..cac04a04 100644 --- a/ui/views/widget/native_widget_mac.h +++ b/ui/views/widget/native_widget_mac.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ +#include "base/macros.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/widget/native_widget_private.h" diff --git a/ui/views/widget/native_widget_mac_interactive_uitest.mm b/ui/views/widget/native_widget_mac_interactive_uitest.mm index 08bdde3..8f19266 100644 --- a/ui/views/widget/native_widget_mac_interactive_uitest.mm +++ b/ui/views/widget/native_widget_mac_interactive_uitest.mm @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #import "ui/base/test/windowed_nsnotification_observer.h" #include "ui/views/test/test_widget_observer.h" #include "ui/views/test/widget_test.h" diff --git a/ui/views/widget/native_widget_mac_unittest.mm b/ui/views/widget/native_widget_mac_unittest.mm index 6bb3f1d..5a48f025 100644 --- a/ui/views/widget/native_widget_mac_unittest.mm +++ b/ui/views/widget/native_widget_mac_unittest.mm @@ -9,9 +9,10 @@ #import "base/mac/foundation_util.h" #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" +#include "base/macros.h" #include "base/run_loop.h" -#include "base/strings/utf_string_conversions.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #import "testing/gtest_mac.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/ui/views/widget/native_widget_unittest.cc b/ui/views/widget/native_widget_unittest.cc index 1193032..7c5c268 100644 --- a/ui/views/widget/native_widget_unittest.cc +++ b/ui/views/widget/native_widget_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index 1270bf7..ff1294a 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/cursor/cursor.h" diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h index 3e7b524..58c647f 100644 --- a/ui/views/widget/root_view.h +++ b/ui/views/widget/root_view.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "ui/events/event_processor.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/widget/root_view_targeter.h b/ui/views/widget/root_view_targeter.h index 3f1e2c1..ccb01d4 100644 --- a/ui/views/widget/root_view_targeter.h +++ b/ui/views/widget/root_view_targeter.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WIDGET_ROOT_VIEW_TARGETER_H_ #define UI_VIEWS_WIDGET_ROOT_VIEW_TARGETER_H_ +#include "base/macros.h" #include "ui/views/view_targeter.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc index ea739ae..03f672d 100644 --- a/ui/views/widget/root_view_unittest.cc +++ b/ui/views/widget/root_view_unittest.cc @@ -4,6 +4,7 @@ #include "ui/views/widget/root_view.h" +#include "base/macros.h" #include "ui/events/event_utils.h" #include "ui/views/context_menu_controller.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/widget/tooltip_manager.h b/ui/views/widget/tooltip_manager.h index 4145db4..4287fc5 100644 --- a/ui/views/widget/tooltip_manager.h +++ b/ui/views/widget/tooltip_manager.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/strings/string16.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/views_export.h" diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h index 87c0f4e..8d6bd9a 100644 --- a/ui/views/widget/tooltip_manager_aura.h +++ b/ui/views/widget/tooltip_manager_aura.h @@ -6,6 +6,7 @@ #define UI_VIEWS_WIDGET_TOOLTIP_MANAGER_AURA_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/gfx/geometry/point.h" #include "ui/views/widget/tooltip_manager.h" diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 6873cde..aaa9320 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -5,6 +5,7 @@ #include "ui/views/widget/widget.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index b53bb48..4ad8c2b 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -9,9 +9,11 @@ #include <stack> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/scoped_observer.h" +#include "build/build_config.h" #include "ui/base/ui_base_types.h" #include "ui/events/event_source.h" #include "ui/gfx/geometry/rect.h" diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h index 2219699..660313d 100644 --- a/ui/views/widget/widget_delegate.h +++ b/ui/views/widget/widget_delegate.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "ui/accessibility/ax_enums.h" #include "ui/base/ui_base_types.h" #include "ui/views/view.h" diff --git a/ui/views/widget/widget_deletion_observer.h b/ui/views/widget/widget_deletion_observer.h index 6957584..8d8cdaa 100644 --- a/ui/views/widget/widget_deletion_observer.h +++ b/ui/views/widget/widget_deletion_observer.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_WIDGET_WIDGET_DELETION_OBSERVER_H_ #define UI_VIEWS_WIDGET_WIDGET_DELETION_OBSERVER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/views/views_export.h" #include "ui/views/widget/widget_observer.h" diff --git a/ui/views/widget/widget_hwnd_utils.cc b/ui/views/widget/widget_hwnd_utils.cc index 29f6ce0..a68b861 100644 --- a/ui/views/widget/widget_hwnd_utils.cc +++ b/ui/views/widget/widget_hwnd_utils.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/win/windows_version.h" +#include "build/build_config.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/ui_base_switches.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index 802d516..01cc4d8 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc @@ -2,13 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/ime/input_method.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index db8b112..54f27d3 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -5,12 +5,13 @@ #include <algorithm> #include <set> -#include "base/basictypes.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ui/views/widget/window_reorderer.cc b/ui/views/widget/window_reorderer.cc index 12e29e1..2f83b18 100644 --- a/ui/views/widget/window_reorderer.cc +++ b/ui/views/widget/window_reorderer.cc @@ -4,9 +4,12 @@ #include "ui/views/widget/window_reorderer.h" +#include <stddef.h> + #include <map> #include <vector> +#include "base/macros.h" #include "ui/aura/window.h" #include "ui/views/view.h" #include "ui/views/view_constants_aura.h" diff --git a/ui/views/widget/window_reorderer.h b/ui/views/widget/window_reorderer.h index 752b2f3..7b9db7c 100644 --- a/ui/views/widget/window_reorderer.h +++ b/ui/views/widget/window_reorderer.h @@ -6,6 +6,7 @@ #define UI_VIEWS_WIDGET_WINDOW_REORDERER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/window_observer.h" diff --git a/ui/views/win/fullscreen_handler.h b/ui/views/win/fullscreen_handler.h index 4a620d5..176cbed 100644 --- a/ui/views/win/fullscreen_handler.h +++ b/ui/views/win/fullscreen_handler.h @@ -9,7 +9,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" namespace gfx { class Rect; diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index c3a1949..86ed8f8 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -13,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/debug/alias.h" +#include "base/macros.h" #include "base/trace_event/trace_event.h" #include "base/win/scoped_gdi_object.h" #include "base/win/windows_version.h" diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h index 7dcda04..4b7ab41 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -6,12 +6,13 @@ #define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_ #include <windows.h> +#include <stddef.h> #include <set> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/ui/views/win/scoped_fullscreen_visibility.h b/ui/views/win/scoped_fullscreen_visibility.h index b78b800..2f11211 100644 --- a/ui/views/win/scoped_fullscreen_visibility.h +++ b/ui/views/win/scoped_fullscreen_visibility.h @@ -9,7 +9,7 @@ #include <map> -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/views/views_export.h" namespace views { diff --git a/ui/views/win/windows_session_change_observer.cc b/ui/views/win/windows_session_change_observer.cc index 777bf8c..a96c566 100644 --- a/ui/views/win/windows_session_change_observer.cc +++ b/ui/views/win/windows_session_change_observer.cc @@ -11,6 +11,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index a699cd1..05cb09d 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -8,6 +8,7 @@ #include <vector> #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h index b8fc5c4..cb24131 100644 --- a/ui/views/window/custom_frame_view.h +++ b/ui/views/window/custom_frame_view.h @@ -5,8 +5,8 @@ #ifndef UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "ui/views/controls/button/button.h" #include "ui/views/window/frame_buttons.h" diff --git a/ui/views/window/custom_frame_view_unittest.cc b/ui/views/window/custom_frame_view_unittest.cc index 1320f48..403f3b5 100644 --- a/ui/views/window/custom_frame_view_unittest.cc +++ b/ui/views/window/custom_frame_view_unittest.cc @@ -6,6 +6,8 @@ #include <vector> +#include "base/macros.h" +#include "build/build_config.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index 8903650..04f9b2f 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "build/build_config.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/background.h" #include "ui/views/controls/button/blue_button.h" diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h index e61923b..05e14b4 100644 --- a/ui/views/window/dialog_client_view.h +++ b/ui/views/window/dialog_client_view.h @@ -6,6 +6,7 @@ #define UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/button/button.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/window/dialog_client_view_unittest.cc b/ui/views/window/dialog_client_view_unittest.cc index 49d5d77..2a08f3e 100644 --- a/ui/views/window/dialog_client_view_unittest.cc +++ b/ui/views/window/dialog_client_view_unittest.cc @@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/test/test_views.h" diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc index 974879b..8f292ec 100644 --- a/ui/views/window/dialog_delegate.cc +++ b/ui/views/window/dialog_delegate.cc @@ -7,6 +7,7 @@ #include <utility> #include "base/logging.h" +#include "build/build_config.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_palette.h" diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h index 3f4d18d40..dc9f89a 100644 --- a/ui/views/window/dialog_delegate.h +++ b/ui/views/window/dialog_delegate.h @@ -6,6 +6,7 @@ #define UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "ui/accessibility/ax_enums.h" #include "ui/base/models/dialog_model.h" diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc index 4292339..3499426 100644 --- a/ui/views/window/dialog_delegate_unittest.cc +++ b/ui/views/window/dialog_delegate_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/hit_test.h" #include "ui/views/bubble/bubble_border.h" diff --git a/ui/views/window/frame_background.h b/ui/views/window/frame_background.h index bdabf51..c2278c1 100644 --- a/ui/views/window/frame_background.h +++ b/ui/views/window/frame_background.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_WINDOW_FRAME_BACKGROUND_H_ #define UI_VIEWS_WINDOW_FRAME_BACKGROUND_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/views/views_export.h" diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc index fb37b6f..cd9e054 100644 --- a/ui/views/window/native_frame_view.cc +++ b/ui/views/window/native_frame_view.cc @@ -4,6 +4,7 @@ #include "ui/views/window/native_frame_view.h" +#include "build/build_config.h" #include "ui/views/widget/native_widget.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/window/native_frame_view.h b/ui/views/window/native_frame_view.h index 4e38979..b8aa632 100644 --- a/ui/views/window/native_frame_view.h +++ b/ui/views/window/native_frame_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ #define UI_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_ +#include "base/macros.h" #include "ui/views/window/non_client_view.h" namespace views { diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h index 4efde57..65ac395 100644 --- a/ui/views/window/non_client_view.h +++ b/ui/views/window/non_client_view.h @@ -5,6 +5,7 @@ #ifndef UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ +#include "base/macros.h" #include "ui/views/view.h" #include "ui/views/view_targeter_delegate.h" |