diff options
231 files changed, 409 insertions, 82 deletions
diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_handler.h b/extensions/common/api/bluetooth/bluetooth_manifest_handler.h index b87fd51..16f749e 100644 --- a/extensions/common/api/bluetooth/bluetooth_manifest_handler.h +++ b/extensions/common/api/bluetooth/bluetooth_manifest_handler.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/extensions/common/api/declarative/declarative_manifest_data.cc b/extensions/common/api/declarative/declarative_manifest_data.cc index 0808887b..44f23bb 100644 --- a/extensions/common/api/declarative/declarative_manifest_data.cc +++ b/extensions/common/api/declarative/declarative_manifest_data.cc @@ -4,6 +4,9 @@ #include "extensions/common/api/declarative/declarative_manifest_data.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "extensions/common/manifest_constants.h" diff --git a/extensions/common/api/declarative/declarative_manifest_data.h b/extensions/common/api/declarative/declarative_manifest_data.h index 9ba9118..d314704 100644 --- a/extensions/common/api/declarative/declarative_manifest_data.h +++ b/extensions/common/api/declarative/declarative_manifest_data.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/strings/string16.h" #include "extensions/common/api/events.h" diff --git a/extensions/common/api/declarative/declarative_manifest_handler.h b/extensions/common/api/declarative/declarative_manifest_handler.h index f555bff..3107a3d 100644 --- a/extensions/common/api/declarative/declarative_manifest_handler.h +++ b/extensions/common/api/declarative/declarative_manifest_handler.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/extensions/common/api/sockets/sockets_manifest_handler.h b/extensions/common/api/sockets/sockets_manifest_handler.h index 64686a0..03bea8d 100644 --- a/extensions/common/api/sockets/sockets_manifest_handler.h +++ b/extensions/common/api/sockets/sockets_manifest_handler.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc index 66fb8c3..d0dc609 100644 --- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc +++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc @@ -6,6 +6,7 @@ #include <tuple> #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/pickle.h" #include "base/values.h" #include "extensions/common/api/sockets/sockets_manifest_permission.h" diff --git a/extensions/common/cast/cast_cert_validator.cc b/extensions/common/cast/cast_cert_validator.cc index bafbe6a..1d38853 100644 --- a/extensions/common/cast/cast_cert_validator.cc +++ b/extensions/common/cast/cast_cert_validator.cc @@ -8,6 +8,8 @@ #include <openssl/evp.h> #include <openssl/rsa.h> #include <openssl/x509.h> +#include <stddef.h> +#include <stdint.h> #include <utility> #include "base/logging.h" diff --git a/extensions/common/cast/cast_cert_validator.h b/extensions/common/cast/cast_cert_validator.h index 8a37fa1..af5a055 100644 --- a/extensions/common/cast/cast_cert_validator.h +++ b/extensions/common/cast/cast_cert_validator.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" diff --git a/extensions/common/constants.h b/extensions/common/constants.h index 78c8f29..6ecbe2b 100644 --- a/extensions/common/constants.h +++ b/extensions/common/constants.h @@ -5,7 +5,6 @@ #ifndef EXTENSIONS_COMMON_CONSTANTS_H_ #define EXTENSIONS_COMMON_CONSTANTS_H_ -#include "base/basictypes.h" #include "base/files/file_path.h" #include "ui/base/layout.h" diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc index 8f9406f..22a1325 100644 --- a/extensions/common/csp_validator.cc +++ b/extensions/common/csp_validator.cc @@ -4,8 +4,11 @@ #include "extensions/common/csp_validator.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" diff --git a/extensions/common/csp_validator_unittest.cc b/extensions/common/csp_validator_unittest.cc index ed80024..d988741 100644 --- a/extensions/common/csp_validator_unittest.cc +++ b/extensions/common/csp_validator_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "extensions/common/csp_validator.h" #include "extensions/common/error_utils.h" #include "extensions/common/install_warning.h" diff --git a/extensions/common/event_filter.h b/extensions/common/event_filter.h index ddd0681..8f6d604 100644 --- a/extensions/common/event_filter.h +++ b/extensions/common/event_filter.h @@ -8,6 +8,7 @@ #include <map> #include <set> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "components/url_matcher/url_matcher.h" #include "extensions/common/event_filtering_info.h" diff --git a/extensions/common/event_matcher.h b/extensions/common/event_matcher.h index 70c4b78..3bffd24 100644 --- a/extensions/common/event_matcher.h +++ b/extensions/common/event_matcher.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_COMMON_EVENT_MATCHER_H_ #define EXTENSIONS_COMMON_EVENT_MATCHER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc index f51d893..3f7e43b 100644 --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc @@ -4,10 +4,11 @@ #include "extensions/common/extension.h" +#include <stddef.h> + #include <utility> #include "base/base64.h" -#include "base/basictypes.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/i18n/rtl.h" diff --git a/extensions/common/extension.h b/extensions/common/extension.h index 72c4396..2363841 100644 --- a/extensions/common/extension.h +++ b/extensions/common/extension.h @@ -15,6 +15,7 @@ #include "base/containers/hash_tables.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc index afafa81..b30af5f 100644 --- a/extensions/common/extension_api.cc +++ b/extensions/common/extension_api.cc @@ -4,6 +4,8 @@ #include "extensions/common/extension_api.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <utility> @@ -13,6 +15,7 @@ #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/extensions/common/extension_api.h b/extensions/common/extension_api.h index 715d820..fc3e20c 100644 --- a/extensions/common/extension_api.h +++ b/extensions/common/extension_api.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h index 3ceda07..4734baa 100644 --- a/extensions/common/extension_builder.h +++ b/extensions/common/extension_builder.h @@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc index c4ebbe9..a423ba5 100644 --- a/extensions/common/extension_l10n_util.cc +++ b/extensions/common/extension_l10n_util.cc @@ -4,6 +4,8 @@ #include "extensions/common/extension_l10n_util.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <string> diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc index 1fee836..15bc121 100644 --- a/extensions/common/extension_messages.cc +++ b/extensions/common/extension_messages.cc @@ -4,6 +4,8 @@ #include "extensions/common/extension_messages.h" +#include <stddef.h> + #include "content/public/common/common_param_traits.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h index 212cd7f..ce8f251 100644 --- a/extensions/common/extension_messages.h +++ b/extensions/common/extension_messages.h @@ -5,6 +5,8 @@ // IPC messages for extensions. // Multiply-included message file, hence no include guard. +#include <stdint.h> + #include <string> #include <vector> @@ -517,7 +519,7 @@ IPC_MESSAGE_CONTROL2(ExtensionMsg_WakeEventPageResponse, // sequence_id so that we can tell which message it is responding to. IPC_MESSAGE_CONTROL2(ExtensionMsg_ShouldSuspend, std::string /* extension_id */, - uint64 /* sequence_id */) + uint64_t /* sequence_id */) // If we complete a round of ShouldSuspend->ShouldSuspendAck messages without // the lazy background page becoming active again, we are ready to unload. This @@ -532,7 +534,7 @@ IPC_MESSAGE_CONTROL1(ExtensionMsg_CancelSuspend, // Response to the renderer for ExtensionHostMsg_GetAppInstallState. IPC_MESSAGE_ROUTED2(ExtensionMsg_GetAppInstallStateResponse, std::string /* state */, - int32 /* callback_id */) + int32_t /* callback_id */) // Dispatch the Port.onConnect event for message channels. IPC_MESSAGE_ROUTED5(ExtensionMsg_DispatchOnConnect, @@ -699,19 +701,19 @@ IPC_MESSAGE_ROUTED2(ExtensionHostMsg_ContentScriptsExecuting, IPC_MESSAGE_ROUTED3(ExtensionHostMsg_RequestScriptInjectionPermission, std::string /* extension id */, extensions::UserScript::InjectionType /* script type */, - int64 /* request id */) + int64_t /* request id */) // Sent from the browser to the renderer in reply to a // RequestScriptInjectionPermission message, granting permission for a script // script to run. IPC_MESSAGE_ROUTED1(ExtensionMsg_PermitScriptInjection, - int64 /* request id */) + int64_t /* request id */) // Sent by the renderer when a web page is checking if its app is installed. IPC_MESSAGE_ROUTED3(ExtensionHostMsg_GetAppInstallState, GURL /* requestor_url */, - int32 /* return_route_id */, - int32 /* callback_id */) + int32_t /* return_route_id */, + int32_t /* callback_id */) // Optional Ack message sent to the browser to notify that the response to a // function has been processed. @@ -721,7 +723,7 @@ IPC_MESSAGE_ROUTED1(ExtensionHostMsg_ResponseAck, // Response to ExtensionMsg_ShouldSuspend. IPC_MESSAGE_CONTROL2(ExtensionHostMsg_ShouldSuspendAck, std::string /* extension_id */, - uint64 /* sequence_id */) + uint64_t /* sequence_id */) // Response to ExtensionMsg_Suspend, after we dispatch the suspend event. IPC_MESSAGE_CONTROL1(ExtensionHostMsg_SuspendAck, @@ -791,7 +793,7 @@ IPC_MESSAGE_ROUTED4(ExtensionHostMsg_DetailedConsoleMessageAdded, base::string16 /* message */, base::string16 /* source */, extensions::StackTrace /* stack trace */, - int32 /* severity level */) + int32_t /* severity level */) // Sent when a query selector request is made from the automation API. // acc_obj_id is the accessibility tree ID of the starting element. diff --git a/extensions/common/extension_resource.cc b/extensions/common/extension_resource.cc index 13824c1..e1eaa3c 100644 --- a/extensions/common/extension_resource.cc +++ b/extensions/common/extension_resource.cc @@ -4,6 +4,8 @@ #include "extensions/common/extension_resource.h" +#include <stddef.h> + #include "base/files/file_util.h" #include "base/logging.h" #include "base/threading/thread_restrictions.h" diff --git a/extensions/common/extension_resource_unittest.cc b/extensions/common/extension_resource_unittest.cc index c3285eb..fb974d9 100644 --- a/extensions/common/extension_resource_unittest.cc +++ b/extensions/common/extension_resource_unittest.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <algorithm> #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" +#include "build/build_config.h" #include "components/crx_file/id_util.h" #include "extensions/common/constants.h" #include "extensions/common/extension_paths.h" diff --git a/extensions/common/extension_set.h b/extensions/common/extension_set.h index c46163f..3bcc1f3 100644 --- a/extensions/common/extension_set.h +++ b/extensions/common/extension_set.h @@ -5,12 +5,15 @@ #ifndef EXTENSIONS_COMMON_EXTENSION_SET_H_ #define EXTENSIONS_COMMON_EXTENSION_SET_H_ +#include <stddef.h> + #include <iterator> #include <map> #include <string> #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/extensions/common/extension_set_unittest.cc b/extensions/common/extension_set_unittest.cc index 54be17f..8674cc7 100644 --- a/extensions/common/extension_set_unittest.cc +++ b/extensions/common/extension_set_unittest.cc @@ -7,6 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "build/build_config.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/common/extensions_client.cc b/extensions/common/extensions_client.cc index 89d420b..9f453ef 100644 --- a/extensions/common/extensions_client.cc +++ b/extensions/common/extensions_client.cc @@ -4,7 +4,6 @@ #include "extensions/common/extensions_client.h" -#include "base/basictypes.h" #include "base/logging.h" #include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_handlers/icons_handler.h" diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc index f61781f..d8c6b98 100644 --- a/extensions/common/feature_switch.cc +++ b/extensions/common/feature_switch.cc @@ -8,6 +8,7 @@ #include "base/lazy_instance.h" #include "base/metrics/field_trial.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "extensions/common/switches.h" namespace extensions { diff --git a/extensions/common/feature_switch.h b/extensions/common/feature_switch.h index 8bb7a41..c170f9c 100644 --- a/extensions/common/feature_switch.h +++ b/extensions/common/feature_switch.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" namespace base { class CommandLine; diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc index 3b60e47..4f31527 100644 --- a/extensions/common/features/base_feature_provider.cc +++ b/extensions/common/features/base_feature_provider.cc @@ -4,6 +4,8 @@ #include "extensions/common/features/base_feature_provider.h" +#include <stddef.h> + #include <stack> #include <utility> diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h index 663b1e77..a1a0f67 100644 --- a/extensions/common/features/complex_feature.h +++ b/extensions/common/features/complex_feature.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" diff --git a/extensions/common/features/feature.cc b/extensions/common/features/feature.cc index 21aa289..dc28d6d 100644 --- a/extensions/common/features/feature.cc +++ b/extensions/common/features/feature.cc @@ -10,6 +10,7 @@ #include "base/lazy_instance.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/features/feature_provider.cc b/extensions/common/features/feature_provider.cc index 79ecf73..7f93ba9 100644 --- a/extensions/common/features/feature_provider.cc +++ b/extensions/common/features/feature_provider.cc @@ -6,7 +6,6 @@ #include <map> -#include "base/basictypes.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/memory/linked_ptr.h" diff --git a/extensions/common/features/feature_util.h b/extensions/common/features/feature_util.h index b8d04fe..f8d6006 100644 --- a/extensions/common/features/feature_util.h +++ b/extensions/common/features/feature_util.h @@ -7,6 +7,7 @@ #include "base/debug/alias.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" // Writes |message| to the stack so that it shows up in the minidump, then diff --git a/extensions/common/features/json_feature_provider_source.h b/extensions/common/features/json_feature_provider_source.h index 7e41cca..11a4fef 100644 --- a/extensions/common/features/json_feature_provider_source.h +++ b/extensions/common/features/json_feature_provider_source.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/values.h" namespace extensions { diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h index f69e658..4ff2c73 100644 --- a/extensions/common/features/simple_feature.h +++ b/extensions/common/features/simple_feature.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_ #define EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_ +#include <stddef.h> + #include <set> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "extensions/common/extension.h" diff --git a/extensions/common/features/simple_feature_filter.h b/extensions/common/features/simple_feature_filter.h index c325250..4f8a8c2 100644 --- a/extensions/common/features/simple_feature_filter.h +++ b/extensions/common/features/simple_feature_filter.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/features/feature.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc index 528c565..afe8d7c 100644 --- a/extensions/common/features/simple_feature_unittest.cc +++ b/extensions/common/features/simple_feature_unittest.cc @@ -4,9 +4,12 @@ #include "extensions/common/features/simple_feature.h" +#include <stddef.h> + #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/values.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/file_util.cc b/extensions/common/file_util.cc index a42bdae..3ddf6d0 100644 --- a/extensions/common/file_util.cc +++ b/extensions/common/file_util.cc @@ -4,6 +4,9 @@ #include "extensions/common/file_util.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -16,6 +19,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -260,7 +264,7 @@ scoped_ptr<base::DictionaryValue> LoadManifest( } bool ValidateFilePath(const base::FilePath& path) { - int64 size = 0; + int64_t size = 0; return base::PathExists(path) && base::GetFileSize(path, &size) && size != 0; } diff --git a/extensions/common/file_util_unittest.cc b/extensions/common/file_util_unittest.cc index 5148737..afbcf3c 100644 --- a/extensions/common/file_util_unittest.cc +++ b/extensions/common/file_util_unittest.cc @@ -4,15 +4,18 @@ #include "extensions/common/file_util.h" +#include <stddef.h> + #include <utility> -#include "base/basictypes.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_paths.h" diff --git a/extensions/common/image_util.cc b/extensions/common/image_util.cc index d2d6079..efad19b 100644 --- a/extensions/common/image_util.cc +++ b/extensions/common/image_util.cc @@ -4,6 +4,7 @@ #include "extensions/common/image_util.h" +#include <stddef.h> #include <stdint.h> #include <vector> diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc index cf39887..112628f 100644 --- a/extensions/common/manifest.cc +++ b/extensions/common/manifest.cc @@ -6,7 +6,6 @@ #include <utility> -#include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/string_split.h" diff --git a/extensions/common/manifest.h b/extensions/common/manifest.h index 51f9938..4ae38d3 100644 --- a/extensions/common/manifest.h +++ b/extensions/common/manifest.h @@ -9,6 +9,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/values.h" diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc index c4e3cd9..c618930 100644 --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.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 "extensions/common/manifest_constants.h" namespace extensions { diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h index cf928bd..9aec423 100644 --- a/extensions/common/manifest_constants.h +++ b/extensions/common/manifest_constants.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_MANIFEST_CONSTANTS_H_ #define EXTENSIONS_COMMON_MANIFEST_CONSTANTS_H_ +#include "build/build_config.h" + namespace extensions { // Keys used in JSON representation of extensions. diff --git a/extensions/common/manifest_handler.cc b/extensions/common/manifest_handler.cc index 78df1cd..815146e 100644 --- a/extensions/common/manifest_handler.cc +++ b/extensions/common/manifest_handler.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handler.h" +#include <stddef.h> + #include <map> #include "base/logging.h" diff --git a/extensions/common/manifest_handler_helpers.cc b/extensions/common/manifest_handler_helpers.cc index f04d0f8..36af224d 100644 --- a/extensions/common/manifest_handler_helpers.cc +++ b/extensions/common/manifest_handler_helpers.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handler_helpers.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/common/manifest_handler_unittest.cc b/extensions/common/manifest_handler_unittest.cc index a014dae..3e01d49 100644 --- a/extensions/common/manifest_handler_unittest.cc +++ b/extensions/common/manifest_handler_unittest.cc @@ -2,6 +2,8 @@ // 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 <vector> diff --git a/extensions/common/manifest_handlers/app_isolation_info.cc b/extensions/common/manifest_handlers/app_isolation_info.cc index 0c4a738..16bd375 100644 --- a/extensions/common/manifest_handlers/app_isolation_info.cc +++ b/extensions/common/manifest_handlers/app_isolation_info.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/app_isolation_info.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" diff --git a/extensions/common/manifest_handlers/app_isolation_info.h b/extensions/common/manifest_handlers/app_isolation_info.h index bb50b1e..dcbb475 100644 --- a/extensions/common/manifest_handlers/app_isolation_info.h +++ b/extensions/common/manifest_handlers/app_isolation_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc index 37da001..7263aae 100644 --- a/extensions/common/manifest_handlers/background_info.cc +++ b/extensions/common/manifest_handlers/background_info.cc @@ -4,9 +4,12 @@ #include "extensions/common/manifest_handlers/background_info.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_util.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h index 87c2f12..66ed985 100644 --- a/extensions/common/manifest_handlers/background_info.h +++ b/extensions/common/manifest_handlers/background_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/content_capabilities_handler.h b/extensions/common/manifest_handlers/content_capabilities_handler.h index ef1bd11..17c7dd1 100644 --- a/extensions/common/manifest_handlers/content_capabilities_handler.h +++ b/extensions/common/manifest_handlers/content_capabilities_handler.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/permissions/permission_set.h" diff --git a/extensions/common/manifest_handlers/csp_info.h b/extensions/common/manifest_handlers/csp_info.h index e1a8537..a9b78d4 100644 --- a/extensions/common/manifest_handlers/csp_info.h +++ b/extensions/common/manifest_handlers/csp_info.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/default_locale_handler.h b/extensions/common/manifest_handlers/default_locale_handler.h index ee5ff4c..7ca4457 100644 --- a/extensions/common/manifest_handlers/default_locale_handler.h +++ b/extensions/common/manifest_handlers/default_locale_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/externally_connectable.cc b/extensions/common/manifest_handlers/externally_connectable.cc index db0748c..31f96e72 100644 --- a/extensions/common/manifest_handlers/externally_connectable.cc +++ b/extensions/common/manifest_handlers/externally_connectable.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/externally_connectable.h" +#include <stddef.h> + #include <algorithm> #include "base/stl_util.h" diff --git a/extensions/common/manifest_handlers/externally_connectable.h b/extensions/common/manifest_handlers/externally_connectable.h index 67756d5..ab3b2b5 100644 --- a/extensions/common/manifest_handlers/externally_connectable.h +++ b/extensions/common/manifest_handlers/externally_connectable.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/extension.h" #include "extensions/common/install_warning.h" diff --git a/extensions/common/manifest_handlers/externally_connectable_unittest.cc b/extensions/common/manifest_handlers/externally_connectable_unittest.cc index 1096fa6..2519588 100644 --- a/extensions/common/manifest_handlers/externally_connectable_unittest.cc +++ b/extensions/common/manifest_handlers/externally_connectable_unittest.cc @@ -2,8 +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 <algorithm> +#include "base/macros.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/externally_connectable.h" diff --git a/extensions/common/manifest_handlers/file_handler_info.cc b/extensions/common/manifest_handlers/file_handler_info.cc index 2ed0ce6..9b0989a 100644 --- a/extensions/common/manifest_handlers/file_handler_info.cc +++ b/extensions/common/manifest_handlers/file_handler_info.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/file_handler_info.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" diff --git a/extensions/common/manifest_handlers/file_handler_info.h b/extensions/common/manifest_handlers/file_handler_info.h index 02012fe..ac458e1 100644 --- a/extensions/common/manifest_handlers/file_handler_info.h +++ b/extensions/common/manifest_handlers/file_handler_info.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc index 5934dc0..d55c148 100644 --- a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc +++ b/extensions/common/manifest_handlers/file_handler_manifest_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 "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/file_handler_info.h" #include "extensions/common/manifest_test.h" diff --git a/extensions/common/manifest_handlers/incognito_info.h b/extensions/common/manifest_handlers/incognito_info.h index c217a23..35df2dd 100644 --- a/extensions/common/manifest_handlers/incognito_info.h +++ b/extensions/common/manifest_handlers/incognito_info.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_COMMON_MANIFEST_HANDLERS_INCOGNITO_INFO_H_ #define EXTENSIONS_COMMON_MANIFEST_HANDLERS_INCOGNITO_INFO_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.h b/extensions/common/manifest_handlers/kiosk_mode_info.h index 9de03a3..d23df60 100644 --- a/extensions/common/manifest_handlers/kiosk_mode_info.h +++ b/extensions/common/manifest_handlers/kiosk_mode_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/launcher_page_info.h b/extensions/common/manifest_handlers/launcher_page_info.h index 96fe1b4..7337658 100644 --- a/extensions/common/manifest_handlers/launcher_page_info.h +++ b/extensions/common/manifest_handlers/launcher_page_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/strings/string16.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/mime_types_handler.cc b/extensions/common/manifest_handlers/mime_types_handler.cc index 61e1342..3c90b609 100644 --- a/extensions/common/manifest_handlers/mime_types_handler.cc +++ b/extensions/common/manifest_handlers/mime_types_handler.cc @@ -4,7 +4,10 @@ #include "extensions/common/manifest_handlers/mime_types_handler.h" +#include <stddef.h> + #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/extensions/common/manifest_handlers/mime_types_handler.h b/extensions/common/manifest_handlers/mime_types_handler.h index 30f46a4..1041a8d 100644 --- a/extensions/common/manifest_handlers/mime_types_handler.h +++ b/extensions/common/manifest_handlers/mime_types_handler.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/nacl_modules_handler.cc b/extensions/common/manifest_handlers/nacl_modules_handler.cc index 4fd7a97..27df6cf 100644 --- a/extensions/common/manifest_handlers/nacl_modules_handler.cc +++ b/extensions/common/manifest_handlers/nacl_modules_handler.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/nacl_modules_handler.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/extensions/common/manifest_handlers/oauth2_manifest_handler.cc b/extensions/common/manifest_handlers/oauth2_manifest_handler.cc index 1d32ecb..73a1320 100644 --- a/extensions/common/manifest_handlers/oauth2_manifest_handler.cc +++ b/extensions/common/manifest_handlers/oauth2_manifest_handler.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/oauth2_manifest_handler.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/common/manifest_handlers/oauth2_manifest_handler.h b/extensions/common/manifest_handlers/oauth2_manifest_handler.h index 36aff05..20276e7 100644 --- a/extensions/common/manifest_handlers/oauth2_manifest_handler.h +++ b/extensions/common/manifest_handlers/oauth2_manifest_handler.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/offline_enabled_info.h b/extensions/common/manifest_handlers/offline_enabled_info.h index e1ba4072..99b9383 100644 --- a/extensions/common/manifest_handlers/offline_enabled_info.h +++ b/extensions/common/manifest_handlers/offline_enabled_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/options_page_info.cc b/extensions/common/manifest_handlers/options_page_info.cc index cb8948e..c46a9c1 100644 --- a/extensions/common/manifest_handlers/options_page_info.cc +++ b/extensions/common/manifest_handlers/options_page_info.cc @@ -5,6 +5,7 @@ #include "extensions/common/manifest_handlers/options_page_info.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "extensions/common/api/extensions_manifest_types.h" diff --git a/extensions/common/manifest_handlers/options_page_info.h b/extensions/common/manifest_handlers/options_page_info.h index b448f6f..fcde3e2 100644 --- a/extensions/common/manifest_handlers/options_page_info.h +++ b/extensions/common/manifest_handlers/options_page_info.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/requirements_info.h b/extensions/common/manifest_handlers/requirements_info.h index ebcb39f..9c87bca8 100644 --- a/extensions/common/manifest_handlers/requirements_info.h +++ b/extensions/common/manifest_handlers/requirements_info.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.cc b/extensions/common/manifest_handlers/sandboxed_page_info.cc index 0fc6589..bc44851 100644 --- a/extensions/common/manifest_handlers/sandboxed_page_info.cc +++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/sandboxed_page_info.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc index ecd68da..87c8e87 100644 --- a/extensions/common/manifest_handlers/shared_module_info.cc +++ b/extensions/common/manifest_handlers/shared_module_info.cc @@ -4,7 +4,10 @@ #include "extensions/common/manifest_handlers/shared_module_info.h" +#include <stddef.h> + #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc b/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc index ecbabbd..63ff88e 100644 --- a/extensions/common/manifest_handlers/shared_module_manifest_unittest.cc +++ b/extensions/common/manifest_handlers/shared_module_manifest_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/version.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/shared_module_info.h" diff --git a/extensions/common/manifest_handlers/web_accessible_resources_info.cc b/extensions/common/manifest_handlers/web_accessible_resources_info.cc index ec188ae..2aa7b2b 100644 --- a/extensions/common/manifest_handlers/web_accessible_resources_info.cc +++ b/extensions/common/manifest_handlers/web_accessible_resources_info.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" +#include <stddef.h> + #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/common/manifest_handlers/web_accessible_resources_info.h b/extensions/common/manifest_handlers/web_accessible_resources_info.h index 6e6143d..9246ca1 100644 --- a/extensions/common/manifest_handlers/web_accessible_resources_info.h +++ b/extensions/common/manifest_handlers/web_accessible_resources_info.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/webview_info.cc b/extensions/common/manifest_handlers/webview_info.cc index f66df27..6775c75 100644 --- a/extensions/common/manifest_handlers/webview_info.cc +++ b/extensions/common/manifest_handlers/webview_info.cc @@ -4,6 +4,8 @@ #include "extensions/common/manifest_handlers/webview_info.h" +#include <stddef.h> + #include <utility> #include "base/memory/scoped_ptr.h" diff --git a/extensions/common/manifest_test.h b/extensions/common/manifest_test.h index d4b95db..32a5fa5 100644 --- a/extensions/common/manifest_test.h +++ b/extensions/common/manifest_test.h @@ -5,6 +5,9 @@ #ifndef EXTENSIONS_COMMON_MANIFEST_TEST_H_ #define EXTENSIONS_COMMON_MANIFEST_TEST_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/extensions/common/manifest_url_handlers.h b/extensions/common/manifest_url_handlers.h index 2ca21d4..fb1b6c7 100644 --- a/extensions/common/manifest_url_handlers.h +++ b/extensions/common/manifest_url_handlers.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/message_bundle.h b/extensions/common/message_bundle.h index 26e9927..9c0bde7 100644 --- a/extensions/common/message_bundle.h +++ b/extensions/common/message_bundle.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_MESSAGE_BUNDLE_H_ #define EXTENSIONS_COMMON_MESSAGE_BUNDLE_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector> diff --git a/extensions/common/message_bundle_unittest.cc b/extensions/common/message_bundle_unittest.cc index 3f332fc..f80473b 100644 --- a/extensions/common/message_bundle_unittest.cc +++ b/extensions/common/message_bundle_unittest.cc @@ -4,10 +4,13 @@ #include "extensions/common/message_bundle.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" diff --git a/extensions/common/one_shot_event.cc b/extensions/common/one_shot_event.cc index a5a4ddc..a61cac8 100644 --- a/extensions/common/one_shot_event.cc +++ b/extensions/common/one_shot_event.cc @@ -4,6 +4,8 @@ #include "extensions/common/one_shot_event.h" +#include <stddef.h> + #include "base/callback.h" #include "base/lazy_instance.h" #include "base/location.h" diff --git a/extensions/common/permissions/api_permission_set.h b/extensions/common/permissions/api_permission_set.h index bcb371b..c913466 100644 --- a/extensions/common/permissions/api_permission_set.h +++ b/extensions/common/permissions/api_permission_set.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_ #define EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_ +#include <stddef.h> + #include <set> #include <string> #include <vector> diff --git a/extensions/common/permissions/base_set_operators.h b/extensions/common/permissions/base_set_operators.h index d18321c..2ac5357 100644 --- a/extensions/common/permissions/base_set_operators.h +++ b/extensions/common/permissions/base_set_operators.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_BASE_SET_OPERATORS_H_ #define EXTENSIONS_COMMON_PERMISSIONS_BASE_SET_OPERATORS_H_ +#include <stddef.h> + #include <iterator> #include <map> diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc index 70a667f..9f9127c 100644 --- a/extensions/common/permissions/extensions_api_permissions.cc +++ b/extensions/common/permissions/extensions_api_permissions.cc @@ -4,8 +4,11 @@ #include "extensions/common/permissions/extensions_api_permissions.h" +#include <stddef.h> + #include <vector> +#include "base/macros.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/socket_permission.h" #include "extensions/common/permissions/usb_device_permission.h" diff --git a/extensions/common/permissions/manifest_permission.h b/extensions/common/permissions/manifest_permission.h index 7d21957..67c41d5 100644 --- a/extensions/common/permissions/manifest_permission.h +++ b/extensions/common/permissions/manifest_permission.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" #include "extensions/common/permissions/api_permission_set.h" diff --git a/extensions/common/permissions/manifest_permission_set.cc b/extensions/common/permissions/manifest_permission_set.cc index fd2d521..39e2ba6 100644 --- a/extensions/common/permissions/manifest_permission_set.cc +++ b/extensions/common/permissions/manifest_permission_set.cc @@ -4,6 +4,8 @@ #include "extensions/common/permissions/manifest_permission_set.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" diff --git a/extensions/common/permissions/media_galleries_permission.cc b/extensions/common/permissions/media_galleries_permission.cc index 1b3b919..6a43268 100644 --- a/extensions/common/permissions/media_galleries_permission.cc +++ b/extensions/common/permissions/media_galleries_permission.cc @@ -4,6 +4,8 @@ #include "extensions/common/permissions/media_galleries_permission.h" +#include <stddef.h> + #include <set> #include <string> diff --git a/extensions/common/permissions/media_galleries_permission.h b/extensions/common/permissions/media_galleries_permission.h index 0276454..870a0a9 100644 --- a/extensions/common/permissions/media_galleries_permission.h +++ b/extensions/common/permissions/media_galleries_permission.h @@ -5,7 +5,6 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ #define EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ -#include "base/basictypes.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/media_galleries_permission_data.h" #include "extensions/common/permissions/set_disjunction_permission.h" diff --git a/extensions/common/permissions/media_galleries_permission_data.h b/extensions/common/permissions/media_galleries_permission_data.h index 920a905..05ae578 100644 --- a/extensions/common/permissions/media_galleries_permission_data.h +++ b/extensions/common/permissions/media_galleries_permission_data.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/permissions/api_permission.h" diff --git a/extensions/common/permissions/permission_message_test_util.cc b/extensions/common/permissions/permission_message_test_util.cc index 9b1981e..d4ff639 100644 --- a/extensions/common/permissions/permission_message_test_util.cc +++ b/extensions/common/permissions/permission_message_test_util.cc @@ -4,6 +4,8 @@ #include "extensions/common/permissions/permission_message_test_util.h" +#include <stddef.h> + #include <algorithm> #include <iterator> diff --git a/extensions/common/permissions/permission_message_util.cc b/extensions/common/permissions/permission_message_util.cc index 566fe85..8fa3e6d 100644 --- a/extensions/common/permissions/permission_message_util.cc +++ b/extensions/common/permissions/permission_message_util.cc @@ -4,6 +4,8 @@ #include "extensions/common/permissions/permission_message_util.h" +#include <stddef.h> + #include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/common/permissions/permission_set.h b/extensions/common/permissions/permission_set.h index 4f02dbd..b03a869 100644 --- a/extensions/common/permissions/permission_set.h +++ b/extensions/common/permissions/permission_set.h @@ -9,6 +9,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc index 5b28d85..8fa22f4 100644 --- a/extensions/common/permissions/permissions_data.cc +++ b/extensions/common/permissions/permissions_data.cc @@ -7,6 +7,7 @@ #include <utility> #include "base/command_line.h" +#include "base/macros.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h index 650c0ef..a78a0c1 100644 --- a/extensions/common/permissions/permissions_data.h +++ b/extensions/common/permissions/permissions_data.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/extensions/common/permissions/permissions_info.h b/extensions/common/permissions/permissions_info.h index 43d61b2..d834c41 100644 --- a/extensions/common/permissions/permissions_info.h +++ b/extensions/common/permissions/permissions_info.h @@ -5,12 +5,15 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_ #define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_ +#include <stddef.h> + #include <map> #include <set> #include <string> #include "base/callback.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permissions_provider.h" diff --git a/extensions/common/permissions/set_disjunction_permission.h b/extensions/common/permissions/set_disjunction_permission.h index 00ffad7..1e124ab 100644 --- a/extensions/common/permissions/set_disjunction_permission.h +++ b/extensions/common/permissions/set_disjunction_permission.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ +#include <stddef.h> + #include <set> #include <string> diff --git a/extensions/common/permissions/socket_permission.h b/extensions/common/permissions/socket_permission.h index 3fb1262..01be06c 100644 --- a/extensions/common/permissions/socket_permission.h +++ b/extensions/common/permissions/socket_permission.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_ #define EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_ +#include <stdint.h> + #include <string> #include "extensions/common/permissions/api_permission.h" @@ -19,7 +21,7 @@ class SocketPermission struct CheckParam : APIPermission::CheckParam { CheckParam(content::SocketPermissionRequest::OperationType type, const std::string& host, - uint16 port) + uint16_t port) : request(type, host, port) {} content::SocketPermissionRequest request; }; diff --git a/extensions/common/permissions/socket_permission_entry.cc b/extensions/common/permissions/socket_permission_entry.cc index 926a07b..fdb6de8 100644 --- a/extensions/common/permissions/socket_permission_entry.cc +++ b/extensions/common/permissions/socket_permission_entry.cc @@ -4,6 +4,8 @@ #include "extensions/common/permissions/socket_permission_entry.h" +#include <stdint.h> + #include <cstdlib> #include <sstream> #include <tuple> @@ -25,8 +27,8 @@ using content::SocketPermissionRequest; const char kColon = ':'; const char kDot = '.'; const char kWildcard[] = "*"; -const uint16 kWildcardPortNumber = 0; -const uint16 kInvalidPort = 65535; +const uint16_t kWildcardPortNumber = 0; +const uint16_t kInvalidPort = 65535; bool StartsOrEndsWithWhitespace(const std::string& str) { return !str.empty() && (base::IsUnicodeWhitespace(str[0]) || @@ -182,7 +184,7 @@ bool SocketPermissionEntry::ParseHostPattern( int port; if (!base::StringToInt(pattern_tokens[1], &port) || port < 1 || port > 65535) return false; - result.pattern_.port = static_cast<uint16>(port); + result.pattern_.port = static_cast<uint16_t>(port); *entry = result; return true; diff --git a/extensions/common/permissions/usb_device_permission.cc b/extensions/common/permissions/usb_device_permission.cc index ab9a936..ab279b6 100644 --- a/extensions/common/permissions/usb_device_permission.cc +++ b/extensions/common/permissions/usb_device_permission.cc @@ -28,7 +28,7 @@ UsbDevicePermission::~UsbDevicePermission() {} PermissionIDSet UsbDevicePermission::GetPermissions() const { PermissionIDSet ids; - std::set<uint16> unknown_product_vendors; + std::set<uint16_t> unknown_product_vendors; bool found_unknown_vendor = false; for (const UsbDevicePermissionData& data : data_set_) { @@ -49,7 +49,7 @@ PermissionIDSet UsbDevicePermission::GetPermissions() const { } } - for (uint16 vendor_id : unknown_product_vendors) { + for (uint16_t vendor_id : unknown_product_vendors) { const char* vendor = device::UsbIds::GetVendorName(vendor_id); DCHECK(vendor); ids.insert(APIPermission::kUsbDeviceUnknownProduct, diff --git a/extensions/common/permissions/usb_device_permission.h b/extensions/common/permissions/usb_device_permission.h index 881d6dd..7cba580 100644 --- a/extensions/common/permissions/usb_device_permission.h +++ b/extensions/common/permissions/usb_device_permission.h @@ -5,7 +5,8 @@ #ifndef EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_ #define EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/set_disjunction_permission.h" #include "extensions/common/permissions/usb_device_permission_data.h" @@ -17,12 +18,12 @@ class UsbDevicePermission UsbDevicePermission> { public: struct CheckParam : public APIPermission::CheckParam { - CheckParam(uint16 vendor_id, uint16 product_id, int interface_id) - : vendor_id(vendor_id), - product_id(product_id), - interface_id(interface_id) {} - const uint16 vendor_id; - const uint16 product_id; + CheckParam(uint16_t vendor_id, uint16_t product_id, int interface_id) + : vendor_id(vendor_id), + product_id(product_id), + interface_id(interface_id) {} + const uint16_t vendor_id; + const uint16_t product_id; const int interface_id; }; diff --git a/extensions/common/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc index 5d49487..3d6817b 100644 --- a/extensions/common/permissions/usb_device_permission_data.cc +++ b/extensions/common/permissions/usb_device_permission_data.cc @@ -9,7 +9,6 @@ #include <tuple> #include <vector> -#include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/extensions/common/stack_frame.h b/extensions/common/stack_frame.h index df66180..671f564 100644 --- a/extensions/common/stack_frame.h +++ b/extensions/common/stack_frame.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_STACK_FRAME_H_ #define EXTENSIONS_COMMON_STACK_FRAME_H_ +#include <stddef.h> + #include <vector> #include "base/memory/scoped_ptr.h" diff --git a/extensions/common/stack_frame_unittest.cc b/extensions/common/stack_frame_unittest.cc index ca71698..51f8867 100644 --- a/extensions/common/stack_frame_unittest.cc +++ b/extensions/common/stack_frame_unittest.cc @@ -4,6 +4,8 @@ #include "extensions/common/stack_frame.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/extensions/common/update_manifest.h b/extensions/common/update_manifest.h index 7ccf3b0..d2b1be4 100644 --- a/extensions/common/update_manifest.h +++ b/extensions/common/update_manifest.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "url/gurl.h" class UpdateManifest { diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc index 6a250e7..0be7aba 100644 --- a/extensions/common/url_pattern.cc +++ b/extensions/common/url_pattern.cc @@ -4,8 +4,11 @@ #include "extensions/common/url_pattern.h" +#include <stddef.h> + #include <ostream> +#include "base/macros.h" #include "base/strings/pattern.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" diff --git a/extensions/common/url_pattern_set.h b/extensions/common/url_pattern_set.h index ce16dd3..717779c 100644 --- a/extensions/common/url_pattern_set.h +++ b/extensions/common/url_pattern_set.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_COMMON_URL_PATTERN_SET_H_ #define EXTENSIONS_COMMON_URL_PATTERN_SET_H_ +#include <stddef.h> + #include <iosfwd> #include <set> diff --git a/extensions/common/url_pattern_set_unittest.cc b/extensions/common/url_pattern_set_unittest.cc index 3929a72..4d3af98 100644 --- a/extensions/common/url_pattern_set_unittest.cc +++ b/extensions/common/url_pattern_set_unittest.cc @@ -4,6 +4,8 @@ #include "extensions/common/url_pattern_set.h" +#include <stddef.h> + #include <sstream> #include "base/values.h" diff --git a/extensions/common/url_pattern_unittest.cc b/extensions/common/url_pattern_unittest.cc index fd8a60e..f0965ca 100644 --- a/extensions/common/url_pattern_unittest.cc +++ b/extensions/common/url_pattern_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/memory/scoped_ptr.h" #include "extensions/common/url_pattern.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/common/user_script.cc b/extensions/common/user_script.cc index 6b64741..08adfbc 100644 --- a/extensions/common/user_script.cc +++ b/extensions/common/user_script.cc @@ -4,6 +4,9 @@ #include "extensions/common/user_script.h" +#include <stddef.h> +#include <stdint.h> + #include "base/atomic_sequence_num.h" #include "base/command_line.h" #include "base/pickle.h" @@ -13,7 +16,7 @@ namespace { -// This cannot be a plain int or int64 because we need to generate unique IDs +// This cannot be a plain int or int64_t because we need to generate unique IDs // from multiple threads. base::StaticAtomicSequenceNumber g_user_script_id_generator; diff --git a/extensions/common/user_script.h b/extensions/common/user_script.h index 93ca14f..8bf16bf 100644 --- a/extensions/common/user_script.h +++ b/extensions/common/user_script.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/strings/string_piece.h" #include "extensions/common/host_id.h" diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc index 1dae0a2..5923f4c 100644 --- a/extensions/common/user_script_unittest.cc +++ b/extensions/common/user_script_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/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/files/file_path.h" #include "base/pickle.h" #include "extensions/common/user_script.h" @@ -190,7 +192,7 @@ TEST(ExtensionUserScriptTest, Pickle) { script1.add_exclude_url_pattern(exclude1); script1.add_exclude_url_pattern(exclude2); - const int64 kId = 12; + const int64_t kId = 12; script1.set_id(kId); const std::string kExtensionId = "foo"; HostID id(HostID::EXTENSIONS, kExtensionId); diff --git a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc index 6874a3a..52f3e7e 100644 --- a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc +++ b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc @@ -4,6 +4,7 @@ #include "extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h" +#include "base/macros.h" #include "components/app_modal/javascript_dialog_extensions_client.h" #include "components/app_modal/javascript_dialog_manager.h" #include "content/public/browser/web_contents.h" diff --git a/extensions/components/native_app_window/native_app_window_views.h b/extensions/components/native_app_window/native_app_window_views.h index 576e9f6..0fa3196 100644 --- a/extensions/components/native_app_window/native_app_window_views.h +++ b/extensions/components/native_app_window/native_app_window_views.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_ #define EXTENSIONS_COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_ +#include "base/macros.h" #include "base/observer_list.h" #include "content/public/browser/web_contents_observer.h" #include "extensions/browser/app_window/app_window.h" diff --git a/extensions/renderer/api/automation/automation_api_helper.h b/extensions/renderer/api/automation/automation_api_helper.h index 0f1c8b0..32aa2ef 100644 --- a/extensions/renderer/api/automation/automation_api_helper.h +++ b/extensions/renderer/api/automation/automation_api_helper.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_API_AUTOMATION_AUTOMATION_API_HELPER_H_ #define EXTENSIONS_RENDERER_API_AUTOMATION_AUTOMATION_API_HELPER_H_ +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/renderer/render_view_observer.h" diff --git a/extensions/renderer/api/mojo_private/mojo_private_unittest.cc b/extensions/renderer/api/mojo_private/mojo_private_unittest.cc index af1801e..344cbe9 100644 --- a/extensions/renderer/api/mojo_private/mojo_private_unittest.cc +++ b/extensions/renderer/api/mojo_private/mojo_private_unittest.cc @@ -4,6 +4,7 @@ #include "extensions/renderer/api_test_base.h" +#include "base/macros.h" #include "gin/modules/module_registry.h" // A test launcher for tests for the mojoPrivate API defined in diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc index c650866..126b041 100644 --- a/extensions/renderer/api/serial/data_receiver_unittest.cc +++ b/extensions/renderer/api/serial/data_receiver_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <queue> #include <utility> +#include "base/macros.h" #include "device/serial/data_source_sender.h" #include "device/serial/data_stream.mojom.h" #include "extensions/renderer/api_test_base.h" diff --git a/extensions/renderer/api/serial/data_sender_unittest.cc b/extensions/renderer/api/serial/data_sender_unittest.cc index dfda6cd..c9a75cc 100644 --- a/extensions/renderer/api/serial/data_sender_unittest.cc +++ b/extensions/renderer/api/serial/data_sender_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include <queue> #include <utility> +#include "base/macros.h" #include "device/serial/data_sink_receiver.h" #include "device/serial/data_stream.mojom.h" #include "extensions/renderer/api_test_base.h" diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc index 216ac5c..0e30cfb 100644 --- a/extensions/renderer/api/serial/serial_api_unittest.cc +++ b/extensions/renderer/api/serial/serial_api_unittest.cc @@ -2,8 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <utility> +#include "base/macros.h" #include "base/thread_task_runner_handle.h" #include "device/serial/serial_device_enumerator.h" #include "device/serial/serial_service_impl.h" diff --git a/extensions/renderer/api_activity_logger.cc b/extensions/renderer/api_activity_logger.cc index f92ce53..e78c274 100644 --- a/extensions/renderer/api_activity_logger.cc +++ b/extensions/renderer/api_activity_logger.cc @@ -2,6 +2,8 @@ // 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/bind.h" diff --git a/extensions/renderer/api_activity_logger.h b/extensions/renderer/api_activity_logger.h index 13f23f9..63a4699 100644 --- a/extensions/renderer/api_activity_logger.h +++ b/extensions/renderer/api_activity_logger.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/common/features/feature.h" #include "extensions/renderer/object_backed_native_handler.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/api_definitions_natives.h b/extensions/renderer/api_definitions_natives.h index e6da645..dcc1b73 100644 --- a/extensions/renderer/api_definitions_natives.h +++ b/extensions/renderer/api_definitions_natives.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_API_DEFINITIONS_NATIVES_H_ #define EXTENSIONS_RENDERER_API_DEFINITIONS_NATIVES_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/app_window_custom_bindings.cc b/extensions/renderer/app_window_custom_bindings.cc index 448a46c..b61c384 100644 --- a/extensions/renderer/app_window_custom_bindings.cc +++ b/extensions/renderer/app_window_custom_bindings.cc @@ -7,6 +7,7 @@ #include <string> #include "base/command_line.h" +#include "base/macros.h" #include "content/public/child/v8_value_converter.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" diff --git a/extensions/renderer/app_window_custom_bindings.h b/extensions/renderer/app_window_custom_bindings.h index 68786a0..26e02c7 100644 --- a/extensions/renderer/app_window_custom_bindings.h +++ b/extensions/renderer/app_window_custom_bindings.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_APP_WINDOW_CUSTOM_BINDINGS_H_ #define EXTENSIONS_RENDERER_APP_WINDOW_CUSTOM_BINDINGS_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" namespace extensions { diff --git a/extensions/renderer/binding_generating_native_handler.cc b/extensions/renderer/binding_generating_native_handler.cc index 7bb9f1a..8912017 100644 --- a/extensions/renderer/binding_generating_native_handler.cc +++ b/extensions/renderer/binding_generating_native_handler.cc @@ -4,6 +4,7 @@ #include "extensions/renderer/binding_generating_native_handler.h" +#include "base/macros.h" #include "extensions/renderer/script_context.h" #include "extensions/renderer/v8_helpers.h" diff --git a/extensions/renderer/console.cc b/extensions/renderer/console.cc index c2a93c2..6416074 100644 --- a/extensions/renderer/console.cc +++ b/extensions/renderer/console.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/extensions/renderer/content_watcher.cc b/extensions/renderer/content_watcher.cc index 75740b5..d16f356 100644 --- a/extensions/renderer/content_watcher.cc +++ b/extensions/renderer/content_watcher.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/content_watcher.h" +#include <stddef.h> + #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" #include "extensions/common/extension_messages.h" diff --git a/extensions/renderer/context_menus_custom_bindings.cc b/extensions/renderer/context_menus_custom_bindings.cc index 3f9d4ff..40f4705 100644 --- a/extensions/renderer/context_menus_custom_bindings.cc +++ b/extensions/renderer/context_menus_custom_bindings.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/context_menus_custom_bindings.h" +#include <stdint.h> + #include "base/bind.h" #include "content/public/renderer/render_thread.h" #include "extensions/common/extension_messages.h" diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index a674504..7ec76ad 100644 --- a/extensions/renderer/dispatcher.cc +++ b/extensions/renderer/dispatcher.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/dispatcher.h" +#include <stddef.h> + #include <utility> #include "base/bind.h" @@ -12,6 +14,7 @@ #include "base/command_line.h" #include "base/debug/alias.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics_action.h" @@ -21,6 +24,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "content/grit/content_resources.h" #include "content/public/child/v8_value_converter.h" #include "content/public/common/browser_plugin_guest_mode.h" @@ -125,8 +129,8 @@ namespace extensions { namespace { -static const int64 kInitialExtensionIdleHandlerDelayMs = 5 * 1000; -static const int64 kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000; +static const int64_t kInitialExtensionIdleHandlerDelayMs = 5 * 1000; +static const int64_t kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000; static const char kEventDispatchFunction[] = "dispatchEvent"; static const char kOnSuspendEvent[] = "runtime.onSuspend"; static const char kOnSuspendCanceledEvent[] = "runtime.onSuspendCanceled"; @@ -935,7 +939,7 @@ void Dispatcher::IdleNotification() { // Dampen the forced delay as well if the extension stays idle for long // periods of time. (forced_idle_timer_ can be NULL after // OnRenderProcessShutdown has been called.) - int64 forced_delay_ms = + int64_t forced_delay_ms = std::max(RenderThread::Get()->GetIdleNotificationDelayInMs(), kMaxExtensionIdleHandlerDelayMs); forced_idle_timer_->Stop(); @@ -1097,7 +1101,7 @@ void Dispatcher::OnSetWebViewPartitionID(const std::string& partition_id) { } void Dispatcher::OnShouldSuspend(const std::string& extension_id, - uint64 sequence_id) { + uint64_t sequence_id) { RenderThread::Get()->Send( new ExtensionHostMsg_ShouldSuspendAck(extension_id, sequence_id)); } diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h index 434dcde..40194a0 100644 --- a/extensions/renderer/dispatcher.h +++ b/extensions/renderer/dispatcher.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_RENDERER_DISPATCHER_H_ #define EXTENSIONS_RENDERER_DISPATCHER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> @@ -12,6 +14,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "base/timer/timer.h" @@ -172,7 +175,7 @@ class Dispatcher : public content::RenderProcessObserver, void OnSetSystemFont(const std::string& font_family, const std::string& font_size); void OnSetWebViewPartitionID(const std::string& partition_id); - void OnShouldSuspend(const std::string& extension_id, uint64 sequence_id); + void OnShouldSuspend(const std::string& extension_id, uint64_t sequence_id); void OnSuspend(const std::string& extension_id); void OnTransferBlobs(const std::vector<std::string>& blob_uuids); void OnUnloaded(const std::string& id); diff --git a/extensions/renderer/display_source_custom_bindings.cc b/extensions/renderer/display_source_custom_bindings.cc index 059d2bb..8be830c 100644 --- a/extensions/renderer/display_source_custom_bindings.cc +++ b/extensions/renderer/display_source_custom_bindings.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/display_source_custom_bindings.h" +#include <stdint.h> + #include "base/bind.h" #include "content/public/child/v8_value_converter.h" #include "extensions/renderer/script_context.h" @@ -50,7 +52,7 @@ v8::Local<v8::Value> GetChildValue(v8::Local<v8::Object> value, const std::string& key_name, v8::Isolate* isolate) { v8::Local<v8::Array> property_names(value->GetOwnPropertyNames()); - for (uint32 i = 0; i < property_names->Length(); ++i) { + for (uint32_t i = 0; i < property_names->Length(); ++i) { v8::Local<v8::Value> key(property_names->Get(i)); if (key_name == *v8::String::Utf8Value(key)) { v8::TryCatch try_catch(isolate); diff --git a/extensions/renderer/event_bindings.cc b/extensions/renderer/event_bindings.cc index b92ed6c..87b8349 100644 --- a/extensions/renderer/event_bindings.cc +++ b/extensions/renderer/event_bindings.cc @@ -4,10 +4,11 @@ #include "extensions/renderer/event_bindings.h" +#include <stdint.h> + #include <map> #include <utility> -#include "base/basictypes.h" #include "base/bind.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" diff --git a/extensions/renderer/extension_frame_helper.h b/extensions/renderer/extension_frame_helper.h index e6f542e..a710d4f 100644 --- a/extensions/renderer/extension_frame_helper.h +++ b/extensions/renderer/extension_frame_helper.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "content/public/common/console_message_level.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" diff --git a/extensions/renderer/extension_helper.cc b/extensions/renderer/extension_helper.cc index 7be6426..8eb0cc8 100644 --- a/extensions/renderer/extension_helper.cc +++ b/extensions/renderer/extension_helper.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/extension_helper.h" +#include <stddef.h> + #include "content/public/renderer/render_view.h" #include "extensions/common/constants.h" #include "extensions/common/extension_messages.h" diff --git a/extensions/renderer/extension_helper.h b/extensions/renderer/extension_helper.h index 0892fa8..a25a0a3 100644 --- a/extensions/renderer/extension_helper.h +++ b/extensions/renderer/extension_helper.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/public/renderer/render_view_observer.h" namespace extensions { diff --git a/extensions/renderer/extension_injection_host.h b/extensions/renderer/extension_injection_host.h index 8996415..a3c9d32 100644 --- a/extensions/renderer/extension_injection_host.h +++ b/extensions/renderer/extension_injection_host.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_EXTENSION_INJECTION_HOST_H_ #define EXTENSIONS_RENDERER_EXTENSION_INJECTION_HOST_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "extensions/common/extension.h" #include "extensions/renderer/injection_host.h" diff --git a/extensions/renderer/extensions_render_frame_observer.cc b/extensions/renderer/extensions_render_frame_observer.cc index f75e27c..dd94caf 100644 --- a/extensions/renderer/extensions_render_frame_observer.cc +++ b/extensions/renderer/extensions_render_frame_observer.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/extensions_render_frame_observer.h" +#include <stddef.h> + #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/render_frame.h" @@ -28,11 +30,10 @@ const char kStackFrameDelimiter[] = "\n at "; // the given line number and source. // |message| will be populated with the error message only (i.e., will not // include any stack trace). -StackTrace GetStackTraceFromMessage( - base::string16* message, - const base::string16& source, - const base::string16& stack_trace, - int32 line_number) { +StackTrace GetStackTraceFromMessage(base::string16* message, + const base::string16& source, + const base::string16& stack_trace, + int32_t line_number) { StackTrace result; std::vector<base::string16> pieces; size_t index = 0; @@ -84,8 +85,8 @@ void ExtensionsRenderFrameObserver::DetailedConsoleMessageAdded( const base::string16& message, const base::string16& source, const base::string16& stack_trace_string, - int32 line_number, - int32 severity_level) { + int32_t line_number, + int32_t severity_level) { base::string16 trimmed_message = message; StackTrace stack_trace = GetStackTraceFromMessage( &trimmed_message, diff --git a/extensions/renderer/extensions_render_frame_observer.h b/extensions/renderer/extensions_render_frame_observer.h index fb2f444..391a33f 100644 --- a/extensions/renderer/extensions_render_frame_observer.h +++ b/extensions/renderer/extensions_render_frame_observer.h @@ -5,7 +5,9 @@ #ifndef EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_ #define EXTENSIONS_RENDERER_EXTENSIONS_RENDER_FRAME_OBSERVER_H_ -#include "base/basictypes.h" +#include <stdint.h> + +#include "base/macros.h" #include "content/public/renderer/render_frame_observer.h" namespace extensions { @@ -24,8 +26,8 @@ class ExtensionsRenderFrameObserver void DetailedConsoleMessageAdded(const base::string16& message, const base::string16& source, const base::string16& stack_trace, - int32 line_number, - int32 severity_level) override; + int32_t line_number, + int32_t severity_level) override; DISALLOW_COPY_AND_ASSIGN(ExtensionsRenderFrameObserver); }; diff --git a/extensions/renderer/extensions_renderer_client.cc b/extensions/renderer/extensions_renderer_client.cc index 91c5aeb..26c46ed 100644 --- a/extensions/renderer/extensions_renderer_client.cc +++ b/extensions/renderer/extensions_renderer_client.cc @@ -4,7 +4,6 @@ #include "extensions/renderer/extensions_renderer_client.h" -#include "base/basictypes.h" #include "base/logging.h" namespace extensions { diff --git a/extensions/renderer/file_system_natives.h b/extensions/renderer/file_system_natives.h index ed6970c..102f220 100644 --- a/extensions/renderer/file_system_natives.h +++ b/extensions/renderer/file_system_natives.h @@ -6,6 +6,7 @@ #define EXTENSIONS_RENDERER_FILE_SYSTEM_NATIVES_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" namespace extensions { diff --git a/extensions/renderer/gc_callback.h b/extensions/renderer/gc_callback.h index 072c191..96dc244 100644 --- a/extensions/renderer/gc_callback.h +++ b/extensions/renderer/gc_callback.h @@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/gc_callback_unittest.cc b/extensions/renderer/gc_callback_unittest.cc index 396e322..f1b70ba 100644 --- a/extensions/renderer/gc_callback_unittest.cc +++ b/extensions/renderer/gc_callback_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "extensions/common/extension.h" diff --git a/extensions/renderer/guest_view/extensions_guest_view_container.h b/extensions/renderer/guest_view/extensions_guest_view_container.h index 35f2211..bc95b18 100644 --- a/extensions/renderer/guest_view/extensions_guest_view_container.h +++ b/extensions/renderer/guest_view/extensions_guest_view_container.h @@ -7,6 +7,7 @@ #include <queue> +#include "base/macros.h" #include "components/guest_view/renderer/guest_view_container.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h b/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h index 8d1d36a..b04ee04 100644 --- a/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h +++ b/extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.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 "components/guest_view/renderer/guest_view_container_dispatcher.h" namespace extensions { diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc index 7d34c75..91f8197 100644 --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc @@ -7,6 +7,7 @@ #include <map> #include <set> +#include "base/macros.h" #include "components/guest_view/common/guest_view_constants.h" #include "components/guest_view/common/guest_view_messages.h" #include "content/public/child/v8_value_converter.h" diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h index 796358e..6c98abe 100644 --- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h +++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h @@ -5,9 +5,12 @@ #ifndef EXTENSIONS_RENDERER_GUEST_VIEW_MIME_HANDLER_VIEW_MIME_HANDLER_VIEW_CONTAINER_H_ #define EXTENSIONS_RENDERER_GUEST_VIEW_MIME_HANDLER_VIEW_MIME_HANDLER_VIEW_CONTAINER_H_ +#include <stdint.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "components/guest_view/renderer/guest_view_container.h" diff --git a/extensions/renderer/i18n_custom_bindings.cc b/extensions/renderer/i18n_custom_bindings.cc index 386b22e..365f50a 100644 --- a/extensions/renderer/i18n_custom_bindings.cc +++ b/extensions/renderer/i18n_custom_bindings.cc @@ -4,9 +4,13 @@ #include "extensions/renderer/i18n_custom_bindings.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" #include "extensions/common/extension_messages.h" diff --git a/extensions/renderer/id_generator_custom_bindings.cc b/extensions/renderer/id_generator_custom_bindings.cc index f9c593b..182c454 100644 --- a/extensions/renderer/id_generator_custom_bindings.cc +++ b/extensions/renderer/id_generator_custom_bindings.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/id_generator_custom_bindings.h" +#include <stdint.h> + #include "base/bind.h" namespace extensions { diff --git a/extensions/renderer/injection_host.h b/extensions/renderer/injection_host.h index cd37a33..21a4c0e 100644 --- a/extensions/renderer/injection_host.h +++ b/extensions/renderer/injection_host.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_INJECTION_HOST_H #define EXTENSIONS_RENDERER_INJECTION_HOST_H +#include "base/macros.h" #include "extensions/common/host_id.h" #include "extensions/common/permissions/permissions_data.h" #include "url/gurl.h" diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc index 777f24f..a0a855f 100644 --- a/extensions/renderer/messaging_bindings.cc +++ b/extensions/renderer/messaging_bindings.cc @@ -4,14 +4,16 @@ #include "extensions/renderer/messaging_bindings.h" +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/values.h" @@ -177,7 +179,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler { if (!renderframe) return; - // Arguments are (int32 port_id, string message). + // Arguments are (int32_t port_id, string message). CHECK(args.Length() == 2 && args[0]->IsInt32() && args[1]->IsString()); int port_id = args[0].As<v8::Int32>()->Value(); @@ -196,7 +198,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler { // Forcefully disconnects a port. void CloseChannel(const v8::FunctionCallbackInfo<v8::Value>& args) { - // Arguments are (int32 port_id, boolean notify_browser). + // Arguments are (int32_t port_id, boolean notify_browser). CHECK_EQ(2, args.Length()); CHECK(args[0]->IsInt32()); CHECK(args[1]->IsBoolean()); @@ -218,7 +220,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler { // A new port has been created for a context. This occurs both when script // opens a connection, and when a connection is opened to this script. void PortAddRef(const v8::FunctionCallbackInfo<v8::Value>& args) { - // Arguments are (int32 port_id). + // Arguments are (int32_t port_id). CHECK_EQ(1, args.Length()); CHECK(args[0]->IsInt32()); @@ -230,7 +232,7 @@ class ExtensionImpl : public ObjectBackedNativeHandler { // frames with a reference to a given port, we will disconnect it and notify // the other end of the channel. void PortRelease(const v8::FunctionCallbackInfo<v8::Value>& args) { - // Arguments are (int32 port_id). + // Arguments are (int32_t port_id). CHECK(args.Length() == 1 && args[0]->IsInt32()); ReleasePort(args[0].As<v8::Int32>()->Value()); } diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc index a2379ea..ef96d73 100644 --- a/extensions/renderer/module_system.cc +++ b/extensions/renderer/module_system.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" diff --git a/extensions/renderer/module_system.h b/extensions/renderer/module_system.h index 45e9c44..134d2ba 100644 --- a/extensions/renderer/module_system.h +++ b/extensions/renderer/module_system.h @@ -12,6 +12,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/renderer/native_handler.h" #include "extensions/renderer/object_backed_native_handler.h" diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc index 0db5495..68c4bd1 100644 --- a/extensions/renderer/module_system_test.cc +++ b/extensions/renderer/module_system_test.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/module_system_test.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> diff --git a/extensions/renderer/module_system_test.h b/extensions/renderer/module_system_test.h index 75f7d9c..517c308 100644 --- a/extensions/renderer/module_system_test.h +++ b/extensions/renderer/module_system_test.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_ #define EXTENSIONS_RENDERER_MODULE_SYSTEM_TEST_H_ +#include "base/macros.h" #include "extensions/renderer/module_system.h" #include "extensions/renderer/script_context.h" #include "gin/public/context_holder.h" diff --git a/extensions/renderer/module_system_unittest.cc b/extensions/renderer/module_system_unittest.cc index d84e31e..f49b3b9 100644 --- a/extensions/renderer/module_system_unittest.cc +++ b/extensions/renderer/module_system_unittest.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/module_system.h" +#include <stdint.h> + #include <utility> #include "base/memory/scoped_ptr.h" diff --git a/extensions/renderer/mojo/keep_alive_client_unittest.cc b/extensions/renderer/mojo/keep_alive_client_unittest.cc index 2d9c63c..022d2d2 100644 --- a/extensions/renderer/mojo/keep_alive_client_unittest.cc +++ b/extensions/renderer/mojo/keep_alive_client_unittest.cc @@ -4,6 +4,7 @@ #include <utility> +#include "base/macros.h" #include "extensions/common/mojo/keep_alive.mojom.h" #include "extensions/renderer/api_test_base.h" #include "grit/extensions_renderer_resources.h" diff --git a/extensions/renderer/mojo/stash_client_unittest.cc b/extensions/renderer/mojo/stash_client_unittest.cc index e92abe9..cddd20d 100644 --- a/extensions/renderer/mojo/stash_client_unittest.cc +++ b/extensions/renderer/mojo/stash_client_unittest.cc @@ -4,6 +4,7 @@ #include <vector> +#include "base/macros.h" #include "extensions/browser/mojo/stash_backend.h" #include "extensions/common/mojo/stash.mojom.h" #include "extensions/renderer/api_test_base.h" diff --git a/extensions/renderer/native_handler.h b/extensions/renderer/native_handler.h index de1b9f5..5b3d3f7 100644 --- a/extensions/renderer/native_handler.h +++ b/extensions/renderer/native_handler.h @@ -5,7 +5,7 @@ #ifndef EXTENSIONS_RENDERER_NATIVE_HANDLER_H_ #define EXTENSIONS_RENDERER_NATIVE_HANDLER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "v8/include/v8.h" namespace extensions { diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc index 421b273..109fae1 100644 --- a/extensions/renderer/object_backed_native_handler.cc +++ b/extensions/renderer/object_backed_native_handler.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/object_backed_native_handler.h" +#include <stddef.h> + #include "base/logging.h" #include "base/memory/linked_ptr.h" #include "extensions/renderer/console.h" diff --git a/extensions/renderer/object_backed_native_handler.h b/extensions/renderer/object_backed_native_handler.h index a60a33a..9842b0b 100644 --- a/extensions/renderer/object_backed_native_handler.h +++ b/extensions/renderer/object_backed_native_handler.h @@ -9,6 +9,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "extensions/renderer/native_handler.h" #include "v8/include/v8-util.h" diff --git a/extensions/renderer/process_info_native_handler.cc b/extensions/renderer/process_info_native_handler.cc index b8fcb57..545a212 100644 --- a/extensions/renderer/process_info_native_handler.cc +++ b/extensions/renderer/process_info_native_handler.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/process_info_native_handler.h" +#include <stdint.h> + #include "base/bind.h" #include "base/command_line.h" #include "extensions/renderer/script_context.h" diff --git a/extensions/renderer/render_frame_observer_natives.cc b/extensions/renderer/render_frame_observer_natives.cc index 5ee47b7..c3a147d 100644 --- a/extensions/renderer/render_frame_observer_natives.cc +++ b/extensions/renderer/render_frame_observer_natives.cc @@ -5,6 +5,7 @@ #include "extensions/renderer/render_frame_observer_natives.h" #include "base/bind.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" diff --git a/extensions/renderer/render_frame_observer_natives.h b/extensions/renderer/render_frame_observer_natives.h index c001caa..946377d 100644 --- a/extensions/renderer/render_frame_observer_natives.h +++ b/extensions/renderer/render_frame_observer_natives.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_RENDER_FRAME_OBSERVER_NATIVES_H_ #define EXTENSIONS_RENDERER_RENDER_FRAME_OBSERVER_NATIVES_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" namespace extensions { diff --git a/extensions/renderer/renderer_extension_registry.h b/extensions/renderer/renderer_extension_registry.h index 6a887a1..97c24bb 100644 --- a/extensions/renderer/renderer_extension_registry.h +++ b/extensions/renderer/renderer_extension_registry.h @@ -5,8 +5,11 @@ #ifndef EXTENSIONS_RENDERER_RENDERER_EXTENSION_REGISTRY_H_ #define EXTENSIONS_RENDERER_RENDERER_EXTENSION_REGISTRY_H_ +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/synchronization/lock.h" #include "extensions/common/extension_set.h" diff --git a/extensions/renderer/request_sender.h b/extensions/renderer/request_sender.h index c3b8538..245c0fe 100644 --- a/extensions/renderer/request_sender.h +++ b/extensions/renderer/request_sender.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/runtime_custom_bindings.cc b/extensions/renderer/runtime_custom_bindings.cc index c6d3ba0..915abf8 100644 --- a/extensions/renderer/runtime_custom_bindings.cc +++ b/extensions/renderer/runtime_custom_bindings.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/runtime_custom_bindings.h" +#include <stdint.h> + #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/extensions/renderer/scoped_web_frame.h b/extensions/renderer/scoped_web_frame.h index 7950552..948a289 100644 --- a/extensions/renderer/scoped_web_frame.h +++ b/extensions/renderer/scoped_web_frame.h @@ -5,6 +5,7 @@ #ifndef SCOPED_WEB_FRAME_H_ #define SCOPED_WEB_FRAME_H_ +#include "base/macros.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc index 8257e8e..7987236 100644 --- a/extensions/renderer/script_context.cc +++ b/extensions/renderer/script_context.cc @@ -5,6 +5,7 @@ #include "extensions/renderer/script_context.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" diff --git a/extensions/renderer/script_context.h b/extensions/renderer/script_context.h index c803b7b..b59a97f 100644 --- a/extensions/renderer/script_context.h +++ b/extensions/renderer/script_context.h @@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/threading/thread_checker.h" #include "extensions/common/features/feature.h" #include "extensions/common/permissions/api_permission_set.h" diff --git a/extensions/renderer/script_context_set.h b/extensions/renderer/script_context_set.h index 68cbd3b..a435614 100644 --- a/extensions/renderer/script_context_set.h +++ b/extensions/renderer/script_context_set.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_ #define EXTENSIONS_RENDERER_SCRIPT_CONTEXT_SET_H_ +#include <stddef.h> + #include <set> #include <string> diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc index 876c07a..2ab3c04 100644 --- a/extensions/renderer/script_injection.cc +++ b/extensions/renderer/script_injection.cc @@ -8,6 +8,7 @@ #include <utility> #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/timer/elapsed_timer.h" #include "base/values.h" @@ -36,10 +37,10 @@ using IsolatedWorldMap = std::map<std::string, int>; base::LazyInstance<IsolatedWorldMap> g_isolated_worlds = LAZY_INSTANCE_INITIALIZER; -const int64 kInvalidRequestId = -1; +const int64_t kInvalidRequestId = -1; // The id of the next pending injection. -int64 g_next_pending_id = 0; +int64_t g_next_pending_id = 0; // Gets the isolated world ID to use for the given |injection_host| // in the given |frame|. If no isolated world has been created for that diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h index 0c7e186..6b36795 100644 --- a/extensions/renderer/script_injection.h +++ b/extensions/renderer/script_injection.h @@ -5,7 +5,8 @@ #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_ #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/callback.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -82,7 +83,7 @@ class ScriptInjection { // Accessors. content::RenderFrame* render_frame() const { return render_frame_; } const HostID& host_id() const { return injection_host_->id(); } - int64 request_id() const { return request_id_; } + int64_t request_id() const { return request_id_; } private: class FrameWatcher; @@ -121,7 +122,7 @@ class ScriptInjection { // This injection's request id. This will be -1 unless the injection is // currently waiting on permission. - int64 request_id_; + int64_t request_id_; // Whether or not the injection is complete, either via injecting the script // or because it will never complete. diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc index e2974af..8876707 100644 --- a/extensions/renderer/script_injection_manager.cc +++ b/extensions/renderer/script_injection_manager.cc @@ -81,7 +81,7 @@ class ScriptInjectionManager::RFOHelper : public content::RenderFrameObserver { const ExtensionId& extension_id, int script_id, const GURL& url); - virtual void OnPermitScriptInjection(int64 request_id); + virtual void OnPermitScriptInjection(int64_t request_id); // Tells the ScriptInjectionManager to run tasks associated with // document_idle. @@ -196,7 +196,7 @@ void ScriptInjectionManager::RFOHelper::OnExecuteDeclarativeScript( } void ScriptInjectionManager::RFOHelper::OnPermitScriptInjection( - int64 request_id) { + int64_t request_id) { manager_->HandlePermitScriptInjection(request_id); } @@ -448,7 +448,7 @@ void ScriptInjectionManager::HandleExecuteDeclarativeScript( } } -void ScriptInjectionManager::HandlePermitScriptInjection(int64 request_id) { +void ScriptInjectionManager::HandlePermitScriptInjection(int64_t request_id) { auto iter = pending_injections_.begin(); for (; iter != pending_injections_.end(); ++iter) { if ((*iter)->request_id() == request_id) { diff --git a/extensions/renderer/script_injection_manager.h b/extensions/renderer/script_injection_manager.h index c85b4fe..c0f5da8 100644 --- a/extensions/renderer/script_injection_manager.h +++ b/extensions/renderer/script_injection_manager.h @@ -5,12 +5,15 @@ #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_ #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_MANAGER_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> #include "base/callback.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "extensions/common/user_script.h" #include "extensions/renderer/script_injection.h" @@ -90,7 +93,7 @@ class ScriptInjectionManager : public UserScriptSetManager::Observer { const GURL& url); // Handle the GrantInjectionPermission extension message. - void HandlePermitScriptInjection(int64 request_id); + void HandlePermitScriptInjection(int64_t request_id); // The map of active web frames to their corresponding statuses. The // RunLocation of the frame corresponds to the last location that has ran. diff --git a/extensions/renderer/scripts_run_info.h b/extensions/renderer/scripts_run_info.h index 0c08715..ebd51df 100644 --- a/extensions/renderer/scripts_run_info.h +++ b/extensions/renderer/scripts_run_info.h @@ -5,11 +5,12 @@ #ifndef EXTENSIONS_RENDERER_SCRIPTS_RUN_INFO_H_ #define EXTENSIONS_RENDERER_SCRIPTS_RUN_INFO_H_ +#include <stddef.h> + #include <map> #include <set> #include <string> -#include "base/basictypes.h" #include "base/macros.h" #include "base/timer/elapsed_timer.h" #include "extensions/common/user_script.h" diff --git a/extensions/renderer/send_request_natives.cc b/extensions/renderer/send_request_natives.cc index 995985e..5b1bfb4 100644 --- a/extensions/renderer/send_request_natives.cc +++ b/extensions/renderer/send_request_natives.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/send_request_natives.h" +#include <stdint.h> + #include "base/json/json_reader.h" #include "content/public/child/v8_value_converter.h" #include "extensions/renderer/request_sender.h" diff --git a/extensions/renderer/send_request_natives.h b/extensions/renderer/send_request_natives.h index 50b4f53..69212e1 100644 --- a/extensions/renderer/send_request_natives.h +++ b/extensions/renderer/send_request_natives.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_SEND_REQUEST_NATIVES_H_ #define EXTENSIONS_RENDERER_SEND_REQUEST_NATIVES_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/set_icon_natives.cc b/extensions/renderer/set_icon_natives.cc index 744b4b4..426acfe 100644 --- a/extensions/renderer/set_icon_natives.cc +++ b/extensions/renderer/set_icon_natives.cc @@ -4,8 +4,12 @@ #include "extensions/renderer/set_icon_natives.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/common/common_param_traits.h" #include "extensions/renderer/request_sender.h" diff --git a/extensions/renderer/set_icon_natives.h b/extensions/renderer/set_icon_natives.h index 5e71443..f425891 100644 --- a/extensions/renderer/set_icon_natives.h +++ b/extensions/renderer/set_icon_natives.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_SET_ICON_NATIVES_H_ #define EXTENSIONS_RENDERER_SET_ICON_NATIVES_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/static_v8_external_one_byte_string_resource.h b/extensions/renderer/static_v8_external_one_byte_string_resource.h index 5ffba3a..3f56958 100644 --- a/extensions/renderer/static_v8_external_one_byte_string_resource.h +++ b/extensions/renderer/static_v8_external_one_byte_string_resource.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_ #define EXTENSIONS_RENDERER_STATIC_V8_EXTERNAL_ONE_BYTE_STRING_RESOURCE_H_ +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/strings/string_piece.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/test_native_handler.h b/extensions/renderer/test_native_handler.h index 057329d..88e5d23 100644 --- a/extensions/renderer/test_native_handler.h +++ b/extensions/renderer/test_native_handler.h @@ -6,6 +6,7 @@ #define EXTENSIONS_RENDERER_TEST_NATIVE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" #include "v8/include/v8.h" diff --git a/extensions/renderer/user_script_injector.h b/extensions/renderer/user_script_injector.h index c98af0b..6190989 100644 --- a/extensions/renderer/user_script_injector.h +++ b/extensions/renderer/user_script_injector.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_observer.h" #include "extensions/common/user_script.h" diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc index e4d5295..200f84c 100644 --- a/extensions/renderer/user_script_set.cc +++ b/extensions/renderer/user_script_set.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/user_script_set.h" +#include <stddef.h> + #include <utility> #include "base/memory/ref_counted.h" diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h index 42d3190..128b33f 100644 --- a/extensions/renderer/user_script_set.h +++ b/extensions/renderer/user_script_set.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" diff --git a/extensions/renderer/user_script_set_manager.h b/extensions/renderer/user_script_set_manager.h index bf878fe..5cba81e 100644 --- a/extensions/renderer/user_script_set_manager.h +++ b/extensions/renderer/user_script_set_manager.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/shared_memory.h" #include "base/observer_list.h" diff --git a/extensions/renderer/utils_native_handler.cc b/extensions/renderer/utils_native_handler.cc index 35b39eb..d93f2e6 100644 --- a/extensions/renderer/utils_native_handler.cc +++ b/extensions/renderer/utils_native_handler.cc @@ -4,6 +4,7 @@ #include "extensions/renderer/utils_native_handler.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "extensions/renderer/script_context.h" #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" diff --git a/extensions/renderer/utils_native_handler.h b/extensions/renderer/utils_native_handler.h index 407fb6a..c69860f 100644 --- a/extensions/renderer/utils_native_handler.h +++ b/extensions/renderer/utils_native_handler.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_UTILS_NATIVE_HANDLER_H_ #define EXTENSIONS_RENDERER_UTILS_NATIVE_HANDLER_H_ +#include "base/macros.h" #include "extensions/renderer/object_backed_native_handler.h" namespace extensions { diff --git a/extensions/renderer/v8_helpers.h b/extensions/renderer/v8_helpers.h index 0c9a47c..2a6fa9c 100644 --- a/extensions/renderer/v8_helpers.h +++ b/extensions/renderer/v8_helpers.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_V8_HELPERS_H_ #define EXTENSIONS_RENDERER_V8_HELPERS_H_ +#include <stdint.h> #include <string.h> #include "base/strings/string_number_conversions.h" diff --git a/extensions/renderer/v8_schema_registry.cc b/extensions/renderer/v8_schema_registry.cc index e3dd34c..5c49be3 100644 --- a/extensions/renderer/v8_schema_registry.cc +++ b/extensions/renderer/v8_schema_registry.cc @@ -4,6 +4,8 @@ #include "extensions/renderer/v8_schema_registry.h" +#include <stddef.h> + #include <utility> #include "base/logging.h" diff --git a/extensions/renderer/v8_schema_registry.h b/extensions/renderer/v8_schema_registry.h index 2368a6a..08f54b6 100644 --- a/extensions/renderer/v8_schema_registry.h +++ b/extensions/renderer/v8_schema_registry.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gin/public/context_holder.h" #include "v8/include/v8-util.h" diff --git a/extensions/renderer/wake_event_page.cc b/extensions/renderer/wake_event_page.cc index 6097075..e3e2189 100644 --- a/extensions/renderer/wake_event_page.cc +++ b/extensions/renderer/wake_event_page.cc @@ -11,6 +11,7 @@ #include "base/bind_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/child/worker_thread.h" #include "content/public/renderer/render_thread.h" diff --git a/extensions/renderer/web_ui_injection_host.h b/extensions/renderer/web_ui_injection_host.h index 3019a81..a4df5f7 100644 --- a/extensions/renderer/web_ui_injection_host.h +++ b/extensions/renderer/web_ui_injection_host.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_RENDERER_WEBUI_INJECTION_HOST_H_ #define EXTENSIONS_RENDERER_WEBUI_INJECTION_HOST_H_ +#include "base/macros.h" #include "extensions/renderer/injection_host.h" class WebUIInjectionHost : public InjectionHost { diff --git a/extensions/shell/app/shell_main.cc b/extensions/shell/app/shell_main.cc index f3aac10..30cd856 100644 --- a/extensions/shell/app/shell_main.cc +++ b/extensions/shell/app/shell_main.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 "content/public/app/content_main.h" #include "extensions/shell/app/shell_main_delegate.h" diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc index fb762e9..d275927 100644 --- a/extensions/shell/app/shell_main_delegate.cc +++ b/extensions/shell/app/shell_main_delegate.cc @@ -8,6 +8,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" +#include "build/build_config.h" #include "content/public/browser/browser_main_runner.h" #include "content/public/common/content_switches.h" #include "extensions/common/extension_paths.h" diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h index 4a616df..335307a 100644 --- a/extensions/shell/app/shell_main_delegate.h +++ b/extensions/shell/app/shell_main_delegate.h @@ -6,8 +6,10 @@ #define EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "build/build_config.h" #include "content/public/app/content_main_delegate.h" namespace content { diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc index bbd237f..c73a35f 100644 --- a/extensions/shell/browser/default_shell_browser_main_delegate.cc +++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc @@ -8,6 +8,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/strings/string_tokenizer.h" +#include "build/build_config.h" #include "extensions/common/switches.h" #include "extensions/shell/browser/shell_extension_system.h" diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h index 410329e..22b3ec0 100644 --- a/extensions/shell/browser/shell_app_delegate.h +++ b/extensions/shell/browser/shell_app_delegate.h @@ -5,8 +5,9 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_ -#include "extensions/browser/app_window/app_delegate.h" +#include "base/macros.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/app_window/app_delegate.h" namespace extensions { diff --git a/extensions/shell/browser/shell_app_view_guest_delegate.h b/extensions/shell/browser/shell_app_view_guest_delegate.h index ea3e3b6..f74ff6d 100644 --- a/extensions/shell/browser/shell_app_view_guest_delegate.h +++ b/extensions/shell/browser/shell_app_view_guest_delegate.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_VIEW_GUEST_DELEGATE_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_APP_VIEW_GUEST_DELEGATE_H_ +#include "base/macros.h" #include "content/public/common/context_menu_params.h" #include "extensions/browser/guest_view/app_view/app_view_guest_delegate.h" diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h index e93a66d..c0153df1 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos.h +++ b/extensions/shell/browser/shell_audio_controller_chromeos.h @@ -5,6 +5,8 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_AUDIO_CONTROLLER_CHROMEOS_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_AUDIO_CONTROLLER_CHROMEOS_H_ +#include <stdint.h> + #include "base/macros.h" #include "chromeos/audio/cras_audio_handler.h" diff --git a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc index a1563c7..f859a5c 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc +++ b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc @@ -4,6 +4,8 @@ #include "extensions/shell/browser/shell_audio_controller_chromeos.h" +#include <stdint.h> + #include "base/macros.h" #include "chromeos/audio/audio_device.h" #include "chromeos/audio/audio_devices_pref_handler.h" @@ -56,7 +58,7 @@ class ShellAudioControllerTest : public testing::Test { } // Changes the active state of the node with |id| in |nodes|. - void SetNodeActive(AudioNodeList* nodes, uint64 id, bool active) { + void SetNodeActive(AudioNodeList* nodes, uint64_t id, bool active) { for (AudioNodeList::iterator it = nodes->begin(); it != nodes->end(); ++it) { if (it->id == id) { @@ -72,7 +74,7 @@ class ShellAudioControllerTest : public testing::Test { scoped_ptr<ShellAudioController> controller_; // Next audio node ID to be returned by CreateNode(). - uint64 next_node_id_; + uint64_t next_node_id_; private: DISALLOW_COPY_AND_ASSIGN(ShellAudioControllerTest); diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc index 0153679..55aee81 100644 --- a/extensions/shell/browser/shell_browser_main_parts.cc +++ b/extensions/shell/browser/shell_browser_main_parts.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "components/devtools_http_handler/devtools_http_handler.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/storage_monitor/storage_monitor.h" diff --git a/extensions/shell/browser/shell_browser_main_parts.h b/extensions/shell/browser/shell_browser_main_parts.h index 18665b4..0525cbb 100644 --- a/extensions/shell/browser/shell_browser_main_parts.h +++ b/extensions/shell/browser/shell_browser_main_parts.h @@ -5,10 +5,11 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task/cancelable_task_tracker.h" +#include "build/build_config.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/common/main_function_params.h" #include "ui/aura/window_tree_host_observer.h" diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc index 044f0461..52ebc5b 100644 --- a/extensions/shell/browser/shell_content_browser_client.cc +++ b/extensions/shell/browser/shell_content_browser_client.cc @@ -4,9 +4,12 @@ #include "extensions/shell/browser/shell_content_browser_client.h" +#include <stddef.h> + #include <utility> #include "base/command_line.h" +#include "base/macros.h" #include "components/guest_view/browser/guest_view_message_filter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h index 16e51ca..8abdc1e 100644 --- a/extensions/shell/browser/shell_content_browser_client.h +++ b/extensions/shell/browser/shell_content_browser_client.h @@ -6,6 +6,7 @@ #define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/content_browser_client.h" class GURL; diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc index 2cf78ef..9fc1876 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura.cc @@ -9,6 +9,8 @@ #include <vector> #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/shell/browser/shell_app_delegate.h" diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h index 17546c1..7459525 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura.h +++ b/extensions/shell/browser/shell_desktop_controller_aura.h @@ -7,9 +7,10 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "extensions/shell/browser/desktop_controller.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window_tree_host_observer.h" diff --git a/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc b/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc index fc1c01a..8bcfc4a 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura_unittest.cc @@ -7,6 +7,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" +#include "build/build_config.h" #include "ui/aura/test/aura_test_base.h" #if defined(OS_CHROMEOS) diff --git a/extensions/shell/browser/shell_display_info_provider.h b/extensions/shell/browser/shell_display_info_provider.h index 52c8576..ceb30fb 100644 --- a/extensions/shell/browser/shell_display_info_provider.h +++ b/extensions/shell/browser/shell_display_info_provider.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DISPLAY_INFO_PROVIDER_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_DISPLAY_INFO_PROVIDER_H_ +#include "base/macros.h" #include "extensions/browser/api/system_display/display_info_provider.h" namespace extensions { diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h index ca2cb5e..b84c3fd 100644 --- a/extensions/shell/browser/shell_extension_system.h +++ b/extensions/shell/browser/shell_extension_system.h @@ -8,6 +8,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "extensions/browser/extension_system.h" #include "extensions/common/one_shot_event.h" diff --git a/extensions/shell/browser/shell_extension_system_factory.h b/extensions/shell/browser/shell_extension_system_factory.h index f78e64a..ef4fbeb 100644 --- a/extensions/shell/browser/shell_extension_system_factory.h +++ b/extensions/shell/browser/shell_extension_system_factory.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_FACTORY_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "extensions/browser/extension_system_provider.h" diff --git a/extensions/shell/browser/shell_extension_web_contents_observer.h b/extensions/shell/browser/shell_extension_web_contents_observer.h index a2a187f..372b7c2 100644 --- a/extensions/shell/browser/shell_extension_web_contents_observer.h +++ b/extensions/shell/browser/shell_extension_web_contents_observer.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_WEB_CONTENTS_OBSERVER_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_WEB_CONTENTS_OBSERVER_H_ +#include "base/macros.h" #include "content/public/browser/web_contents_user_data.h" #include "extensions/browser/extension_web_contents_observer.h" diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc index fc53b92..c104d1c 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.cc +++ b/extensions/shell/browser/shell_extensions_browser_client.cc @@ -6,6 +6,7 @@ #include <utility> +#include "build/build_config.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h index 8c449ee..da3e8be 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.h +++ b/extensions/shell/browser/shell_extensions_browser_client.h @@ -6,6 +6,8 @@ #define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ #include "base/compiler_specific.h" +#include "base/macros.h" +#include "build/build_config.h" #include "extensions/browser/extensions_browser_client.h" class PrefService; diff --git a/extensions/shell/browser/shell_nacl_browser_delegate.cc b/extensions/shell/browser/shell_nacl_browser_delegate.cc index 9f2b4bc..88db0fd 100644 --- a/extensions/shell/browser/shell_nacl_browser_delegate.cc +++ b/extensions/shell/browser/shell_nacl_browser_delegate.cc @@ -11,6 +11,7 @@ #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" diff --git a/extensions/shell/browser/shell_native_app_window.h b/extensions/shell/browser/shell_native_app_window.h index a63248e..775473c 100644 --- a/extensions/shell/browser/shell_native_app_window.h +++ b/extensions/shell/browser/shell_native_app_window.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_NATIVE_APP_WINDOW_H_ +#include "base/macros.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/native_app_window.h" diff --git a/extensions/shell/browser/shell_native_app_window_mac.h b/extensions/shell/browser/shell_native_app_window_mac.h index 0f98923..23b0fe3 100644 --- a/extensions/shell/browser/shell_native_app_window_mac.h +++ b/extensions/shell/browser/shell_native_app_window_mac.h @@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "extensions/shell/browser/shell_native_app_window.h" @class ShellNSWindow; diff --git a/extensions/shell/browser/shell_network_delegate.h b/extensions/shell/browser/shell_network_delegate.h index 7eef370..8dc76fa 100644 --- a/extensions/shell/browser/shell_network_delegate.h +++ b/extensions/shell/browser/shell_network_delegate.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NETNETWORK_DELEGATE_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_NETNETWORK_DELEGATE_H_ +#include "base/macros.h" #include "extensions/browser/info_map.h" #include "net/base/network_delegate_impl.h" diff --git a/extensions/shell/browser/shell_oauth2_token_service_delegate.h b/extensions/shell/browser/shell_oauth2_token_service_delegate.h index d9add4a..2537092 100644 --- a/extensions/shell/browser/shell_oauth2_token_service_delegate.h +++ b/extensions/shell/browser/shell_oauth2_token_service_delegate.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/public/browser/browser_context.h" #include "google_apis/gaia/oauth2_access_token_fetcher_impl.h" #include "google_apis/gaia/oauth2_token_service_delegate.h" diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc index 5c257bd..fdbc656 100644 --- a/extensions/shell/browser/shell_prefs.cc +++ b/extensions/shell/browser/shell_prefs.cc @@ -9,6 +9,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h" +#include "build/build_config.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" diff --git a/extensions/shell/browser/shell_prefs_unittest.cc b/extensions/shell/browser/shell_prefs_unittest.cc index 4fe55d0..740c0ef 100644 --- a/extensions/shell/browser/shell_prefs_unittest.cc +++ b/extensions/shell/browser/shell_prefs_unittest.cc @@ -4,8 +4,10 @@ #include "extensions/shell/browser/shell_prefs.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "components/user_prefs/user_prefs.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/extensions/shell/browser/shell_runtime_api_delegate.cc b/extensions/shell/browser/shell_runtime_api_delegate.cc index 77dacab..1d0a06f 100644 --- a/extensions/shell/browser/shell_runtime_api_delegate.cc +++ b/extensions/shell/browser/shell_runtime_api_delegate.cc @@ -4,6 +4,7 @@ #include "extensions/shell/browser/shell_runtime_api_delegate.h" +#include "build/build_config.h" #include "extensions/common/api/runtime.h" #if defined(OS_CHROMEOS) diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h index 3a040b1..5d00dc0 100644 --- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.h +++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.h @@ -5,6 +5,7 @@ #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ #define EXTENSIONS_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ +#include "base/macros.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager_delegate.h" diff --git a/extensions/shell/browser/shell_update_query_params_delegate.h b/extensions/shell/browser/shell_update_query_params_delegate.h index 39887e6..90e499b 100644 --- a/extensions/shell/browser/shell_update_query_params_delegate.h +++ b/extensions/shell/browser/shell_update_query_params_delegate.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "components/update_client/update_query_params_delegate.h" namespace extensions { diff --git a/extensions/shell/browser/shell_url_request_context_getter.h b/extensions/shell/browser/shell_url_request_context_getter.h index 0742530..1b6156a 100644 --- a/extensions/shell/browser/shell_url_request_context_getter.h +++ b/extensions/shell/browser/shell_url_request_context_getter.h @@ -6,6 +6,7 @@ #define EXTENSIONS_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "content/shell/browser/shell_url_request_context_getter.h" namespace base { diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc index 5153eea..58a2e2f 100644 --- a/extensions/shell/common/shell_extensions_client.cc +++ b/extensions/shell/common/shell_extensions_client.cc @@ -6,6 +6,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "extensions/common/api/generated_schemas.h" #include "extensions/common/common_manifest_handlers.h" #include "extensions/common/extension_urls.h" diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h index a173185..8c14d06 100644 --- a/extensions/shell/common/shell_extensions_client.h +++ b/extensions/shell/common/shell_extensions_client.h @@ -5,8 +5,8 @@ #ifndef EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_ #define EXTENSIONS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/extensions_api_permissions.h" diff --git a/extensions/shell/test/shell_apitest.h b/extensions/shell/test/shell_apitest.h index 2246b49..b3103e4 100644 --- a/extensions/shell/test/shell_apitest.h +++ b/extensions/shell/test/shell_apitest.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "extensions/shell/test/shell_test.h" namespace extensions { diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc index 183303a..b1e8cc4 100644 --- a/extensions/shell/test/shell_test.cc +++ b/extensions/shell/test/shell_test.cc @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" +#include "build/build_config.h" #include "content/public/common/content_switches.h" #include "extensions/browser/extension_system.h" #include "extensions/shell/browser/desktop_controller.h" diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index 4763268..be0a4b5 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -4,6 +4,8 @@ #include "extensions/utility/unpacker.h" +#include <stddef.h> + #include <set> #include <utility> diff --git a/extensions/utility/unpacker.h b/extensions/utility/unpacker.h index eaffc7b..b05cf3c 100644 --- a/extensions/utility/unpacker.h +++ b/extensions/utility/unpacker.h @@ -9,6 +9,7 @@ #include <vector> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "extensions/common/manifest.h" |