diff options
| author | avi <avi@chromium.org> | 2015-12-24 18:23:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-25 02:24:37 +0000 |
| commit | 0f233432263b842ae54e83ac576c218d2326afbb (patch) | |
| tree | 203eeeb3b589c37d708bbe48df53ba4830f12f37 /chrome/browser | |
| parent | 652869c276104ba02e827df6ee9a119c78e121e0 (diff) | |
| download | chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.zip chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.tar.gz chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.tar.bz2 | |
Switch to standard integer types in chrome/browser/ui/webui/.
BUG=138542
TBR=bauerb@chromium.org
Review URL: https://codereview.chromium.org/1547103002
Cr-Commit-Position: refs/heads/master@{#366846}
Diffstat (limited to 'chrome/browser')
405 files changed, 731 insertions, 181 deletions
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 5d5a332..1fdbd52 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/about_ui.h" +#include <stddef.h> +#include <stdint.h> + #include <algorithm> #include <string> #include <utility> @@ -17,6 +20,7 @@ #include "base/format_macros.h" #include "base/i18n/number_formatting.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/string_number_conversions.h" @@ -27,6 +31,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" @@ -539,7 +544,7 @@ std::vector<std::string> GetHtmlTabDescriptorsForDiscardPage() { std::string AboutDiscards(const std::string& path) { std::string output; - int64 web_content_id; + int64_t web_content_id; memory::TabManager* tab_manager = g_browser_process->GetTabManager(); std::vector<std::string> path_split = base::SplitString( diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h index b453c5b..e0dbfe5 100644 --- a/chrome/browser/ui/webui/about_ui.h +++ b/chrome/browser/ui/webui/about_ui.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc index 0391c99..7d3690e 100644 --- a/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/app_launcher_login_handler.h" +#include <stddef.h> + #include <string> #include "base/bind.h" @@ -12,6 +14,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.h b/chrome/browser/ui/webui/app_launcher_page_ui.h index d51bd71..e0222b8 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.h +++ b/chrome/browser/ui/webui/app_launcher_page_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_PAGE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_PAGE_UI_H_ +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.h b/chrome/browser/ui/webui/app_list/start_page_handler.h index 25293dd..f3a294d 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.h +++ b/chrome/browser/ui/webui/app_list/start_page_handler.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_ui.h b/chrome/browser/ui/webui/app_list/start_page_ui.h index fa70e06..0408914 100644 --- a/chrome/browser/ui/webui/app_list/start_page_ui.h +++ b/chrome/browser/ui/webui/app_list/start_page_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_APP_LIST_START_PAGE_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace app_list { diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc index cb83a4d..ea05f5a 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc @@ -14,6 +14,7 @@ #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h index 970ccf3..a4a1355 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.h +++ b/chrome/browser/ui/webui/bookmarks_ui.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc index 8560489..410e7fc 100644 --- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc +++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/browsing_history_handler.cc b/chrome/browser/ui/webui/browsing_history_handler.cc index 86b83ff..2ca90cc 100644 --- a/chrome/browser/ui/webui/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/browsing_history_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/browsing_history_handler.h" +#include <stddef.h> + #include <set> #include "base/bind.h" @@ -222,7 +224,7 @@ scoped_ptr<base::DictionaryValue> BrowsingHistoryHandler::HistoryEntry::ToValue( // Pass the timestamps in a list. scoped_ptr<base::ListValue> timestamps(new base::ListValue); - for (std::set<int64>::const_iterator it = all_timestamps.begin(); + for (std::set<int64_t>::const_iterator it = all_timestamps.begin(); it != all_timestamps.end(); ++it) { timestamps->AppendDouble(base::Time::FromInternalValue(*it).ToJsTime()); } @@ -761,7 +763,7 @@ void BrowsingHistoryHandler::WebHistoryQueryComplete( for (int j = 0; j < static_cast<int>(ids->GetSize()); ++j) { const base::DictionaryValue* id = NULL; std::string timestamp_string; - int64 timestamp_usec = 0; + int64_t timestamp_usec = 0; if (!ids->GetDictionary(j, &id) || !id->GetString("timestamp_usec", ×tamp_string) || diff --git a/chrome/browser/ui/webui/browsing_history_handler.h b/chrome/browser/ui/webui/browsing_history_handler.h index 38f7777..fa64833 100644 --- a/chrome/browser/ui/webui/browsing_history_handler.h +++ b/chrome/browser/ui/webui/browsing_history_handler.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_ +#include <stdint.h> + #include <string> #include "base/macros.h" @@ -85,7 +87,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, std::string client_id; // Timestamps of all local or remote visits the same URL on the same day. - std::set<int64> all_timestamps; + std::set<int64_t> all_timestamps; // If true, this entry is a search result. bool is_search_result; diff --git a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc index 9a097be..11ad576 100644 --- a/chrome/browser/ui/webui/browsing_history_handler_unittest.cc +++ b/chrome/browser/ui/webui/browsing_history_handler_unittest.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/browsing_history_handler.h" +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -11,7 +14,7 @@ namespace { struct TestResult { std::string url; - int64 hour_offset; // Visit time in hours past the baseline time. + int64_t hour_offset; // Visit time in hours past the baseline time. }; // Duplicates on the same day in the local timezone are removed, so set a diff --git a/chrome/browser/ui/webui/certificate_viewer_ui.h b/chrome/browser/ui/webui/certificate_viewer_ui.h index 3bad0ca..5355a07 100644 --- a/chrome/browser/ui/webui/certificate_viewer_ui.h +++ b/chrome/browser/ui/webui/certificate_viewer_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h index 367f4510..530dfb7 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.h +++ b/chrome/browser/ui/webui/certificate_viewer_webui.h @@ -9,6 +9,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" #include "net/cert/x509_certificate.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc index 543b7f8..78ffc32 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_browsertest.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 "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.h b/chrome/browser/ui/webui/chrome_web_contents_handler.h index 2755a16..b88ea3e 100644 --- a/chrome/browser/ui/webui/chrome_web_contents_handler.h +++ b/chrome/browser/ui/webui/chrome_web_contents_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_CONTENTS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" class ChromeWebContentsHandler diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 8f39092..2689679 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/location.h" #include "base/prefs/pref_service.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" #include "chrome/browser/engagement/site_engagement_service.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h index 909a80c..29064b6 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_ #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_CONTROLLER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/favicon_base/favicon_callback.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h index 90c2666..db26505 100644 --- a/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h +++ b/chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_BLUETOOTH_PAIRING_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc index 9b7cbf3..408351c 100644 --- a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc +++ b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h index 4375d00..59b1622 100644 --- a/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h +++ b/chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CERTIFICATE_MANAGER_DIALOG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CERTIFICATE_MANAGER_DIALOG_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index 3db332e..85e29c9 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" +#include <stddef.h> + #include <set> #include <string> @@ -11,6 +13,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h index 20ca636..fcfba14 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CHOOSE_MOBILE_NETWORK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CHOOSE_MOBILE_NETWORK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h index d0d46e6..f616d28 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_ui.h +++ b/chrome/browser/ui/webui/chromeos/cryptohome_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_CRYPTOHOME_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_CRYPTOHOME_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h index aa7b9af..741fb72 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h +++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/dbus_method_call_status.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 112ddf7..70c5ab5 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -4,10 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h" +#include <stddef.h> +#include <stdint.h> + #include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" @@ -69,11 +73,11 @@ void GetGCacheContents(const base::FilePath& root_path, base::FileEnumerator::SHOW_SYM_LINKS); base::FileEnumerator enumerator(root_path, true /* recursive */, options); - int64 total_size = 0; + int64_t total_size = 0; for (base::FilePath current = enumerator.Next(); !current.empty(); current = enumerator.Next()) { base::FileEnumerator::FileInfo info = enumerator.GetInfo(); - int64 size = info.GetSize(); + int64_t size = info.GetSize(); const bool is_directory = info.IsDirectory(); const bool is_symbolic_link = base::IsLink(info.GetName()); const base::Time last_modified = info.GetLastModifiedTime(); @@ -111,7 +115,7 @@ void GetFreeDiskSpace(const base::FilePath& home_path, DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(local_storage_summary); - const int64 free_space = base::SysInfo::AmountOfFreeDiskSpace(home_path); + const int64_t free_space = base::SysInfo::AmountOfFreeDiskSpace(home_path); local_storage_summary->SetDouble("free_space", free_space); } diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.h b/chrome/browser/ui/webui/chromeos/drive_internals_ui.h index 413f798..de0009e 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.h +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.h @@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_DRIVE_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_DRIVE_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc index 7962d0f..4ae24a7 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc @@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h" +#include <stdint.h> + #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "base/bind.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chromeos/dbus/dbus_thread_manager.h" @@ -325,7 +328,7 @@ void DeviceEmulatorMessageHandler::HandleInsertAudioNode( void DeviceEmulatorMessageHandler::HandleRemoveAudioNode( const base::ListValue* args) { std::string tmp_id; - uint64 id; + uint64_t id; CHECK(args->GetString(0, &tmp_id)); CHECK(base::StringToUint64(tmp_id, &id)); diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h index a6d5224..62a04d9 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_MESSAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_MESSAGE_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h index a695e21..91a8875 100644 --- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h +++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMULATOR_DEVICE_EMULATOR_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace power_manager { diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h index 0c9174b..b5cbce3 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h index 0b48e7e..e53964d 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_FIRST_RUN_FIRST_RUN_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_FIRST_RUN_FIRST_RUN_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content { diff --git a/chrome/browser/ui/webui/chromeos/image_source.cc b/chrome/browser/ui/webui/chromeos/image_source.cc index cd6eb41..5e51f37 100644 --- a/chrome/browser/ui/webui/chromeos/image_source.cc +++ b/chrome/browser/ui/webui/chromeos/image_source.cc @@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/image_source.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 623879c..4858891 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" +#include <stddef.h> + #include "ash/display/display_manager.h" #include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h index d693465..002dad9 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_KEYBOARD_OVERLAY_UI_H_ +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" class KeyboardOverlayUI : public ui::WebDialogUI { diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h index 59a3eb6..a49c958 100644 --- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h @@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h" #include "chrome/browser/chromeos/login/screens/network_error_model.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h b/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h index ba938e7..910f496 100644 --- a/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h +++ b/chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h @@ -7,9 +7,9 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/gaia_auth_fetcher.h" diff --git a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h index 7388314..2c7c682 100644 --- a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_AUTO_ENROLLMENT_CHECK_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h index aadad3a..7824a44 100644 --- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/base_screen_handler.h @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/model_view_channel.h" #include "components/login/base_screen_handler_utils.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h index 6248d1c..5f90e1e 100644 --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" #include "chrome/browser/chromeos/login/version_info_updater.h" diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h index eb77be0..c7f49cf 100644 --- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h +++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h index a36b1d4..469d2b0 100644 --- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ENABLE_DEBUGGING_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h index e63c850..4198e52 100644 --- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h" diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc index d3fc21f..ef2819b 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/helper.h" diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h index 09650e8..a2f9276 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_EULA_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/screens/eula_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h index 2e82d52..4d7005a 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h index d9aea37..6b8d76a 100644 --- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_HID_DETECTION_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_registry_simple.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc index b4f09b8..809c7f1 100644 --- a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc +++ b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/account_tracker_service_factory.h" diff --git a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h index 4c9c2d5..d4309c6 100644 --- a/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h +++ b/chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_INLINE_LOGIN_HANDLER_CHROMEOS_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_INLINE_LOGIN_HANDLER_CHROMEOS_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/signin/inline_login_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc index 9934b05..1dc0fff 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h index ed0be00..f3d5c7e 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h index 63b826d..01be4a2 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_KIOSK_AUTOLAUNCH_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h index 4926967..5498785 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_KIOSK_ENABLE_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h" diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc index 0d2a65e..4e9effb 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc @@ -4,13 +4,14 @@ #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" +#include <stddef.h> + #include <algorithm> #include <iterator> #include <map> #include <set> #include <utility> -#include "base/basictypes.h" #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/location.h" diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc index 3cca922..0b8642c 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc @@ -4,8 +4,9 @@ #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" +#include <stddef.h> + #include "base/at_exit.h" -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index dd2aa82..dd7d245 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index 194db47..76f2949 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chromeos/network/network_state_handler_observer.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h index f4705c0..14ffb66 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index 0054e2f..d4d07bf 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h index 7881381..646f66a 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/base/locale_util.h" #include "chrome/browser/chromeos/login/screens/network_view.h" diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 287a357..7cd5e53 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -4,10 +4,13 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" +#include <stddef.h> + #include "ash/shell_window_ids.h" #include "ash/wm/screen_dimmer.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h index d710683..7ddc98b 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h @@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h index aeb8fb4..fbebfb3 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_RESET_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/reset_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h index 714f59a..013fd33 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h index 87bf490..8d89b68 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SCREENLOCK_ICON_SOURCE_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SCREENLOCK_ICON_SOURCE_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index e208438..f3dc180 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" +#include <stddef.h> + #include <algorithm> #include <vector> @@ -13,6 +15,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 56112fc..f7ca0f4 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -9,10 +9,10 @@ #include <set> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc index aa8f2ec..3f935e7 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_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 "ash/test/ash_test_base.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h index 7fcc42e..d2345f5 100644 --- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "components/user_manager/user_image/default_user_images.h" diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h index 60d3ed5..adf55e3 100644 --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/base/locale_util.h" #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h index 13151fb..4528036 100644 --- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/update_view.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h index fd8d52e..6af410a 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_USER_BOARD_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/login/ui/views/user_board_view.h" diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h index ff15eed..d67a52e 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/login/screens/user_image_view.h" diff --git a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h index 93596f2..367465c 100644 --- a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_WRONG_HWID_SCREEN_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index b3eb49c19..a7b64f5 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_shutdown.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h index a50eb32..50f5460 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/singleton.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 40e9d6d..95ab6a2 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <string> @@ -12,6 +14,7 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h index ff6182b..048cf79 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_MOBILE_SETUP_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc index e676261..697e2c2 100644 --- a/chrome/browser/ui/webui/chromeos/network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/network_ui.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/webui/chromeos/network_ui.h b/chrome/browser/ui/webui/chromeos/network_ui.h index 7921ac8..72d7863 100644 --- a/chrome/browser/ui/webui/chromeos/network_ui.h +++ b/chrome/browser/ui/webui/chromeos/network_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_NETWORK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc index 9f3244e..802877c 100644 --- a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc +++ b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h index b376d42..0bd4470 100644 --- a/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h +++ b/chrome/browser/ui/webui/chromeos/nfc_debug_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_NFC_DEBUG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_NFC_DEBUG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/power_ui.cc b/chrome/browser/ui/webui/chromeos/power_ui.cc index b3db0d0..e3fc6a8 100644 --- a/chrome/browser/ui/webui/chromeos/power_ui.cc +++ b/chrome/browser/ui/webui/chromeos/power_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/power_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" diff --git a/chrome/browser/ui/webui/chromeos/power_ui.h b/chrome/browser/ui/webui/chromeos/power_ui.h index 58def7f..19e21c9 100644 --- a/chrome/browser/ui/webui/chromeos/power_ui.h +++ b/chrome/browser/ui/webui/chromeos/power_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_POWER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_POWER_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index e96976a..a9f5bfa 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h index 1e41312..895625d 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/salsa_ui.cc b/chrome/browser/ui/webui/chromeos/salsa_ui.cc index f919155..efc7ef1 100644 --- a/chrome/browser/ui/webui/chromeos/salsa_ui.cc +++ b/chrome/browser/ui/webui/chromeos/salsa_ui.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/chromeos/salsa_ui.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/salsa_ui.h b/chrome/browser/ui/webui/chromeos/salsa_ui.h index 9ec4770..40a62e1 100644 --- a/chrome/browser/ui/webui/chromeos/salsa_ui.h +++ b/chrome/browser/ui/webui/chromeos/salsa_ui.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc index d4719eb..b32d79b 100644 --- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc +++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc @@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/chromeos/set_time_ui.h" +#include <stdint.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/build_time.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/system/timezone_util.h" @@ -78,7 +81,7 @@ class SetTimeMessageHandler : public content::WebUIMessageHandler, } chromeos::DBusThreadManager::Get()->GetSystemClockClient()->SetTime( - static_cast<int64>(seconds)); + static_cast<int64_t>(seconds)); } // Handler for Javascript call to change the system time zone when the user diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.h b/chrome/browser/ui/webui/chromeos/set_time_ui.h index 9d16b25..a63a0ed 100644 --- a/chrome/browser/ui/webui/chromeos/set_time_ui.h +++ b/chrome/browser/ui/webui/chromeos/set_time_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SET_TIME_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SET_TIME_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 5f8718f..292ab14 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -4,13 +4,16 @@ #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" @@ -383,7 +386,7 @@ void SimUnlockHandler::DeviceListChanged() { return; sim_lock_type_ = cellular_device->sim_lock_type(); - uint32 retries_left = cellular_device->sim_retries_left(); + uint32_t retries_left = cellular_device->sim_retries_left(); VLOG(1) << "OnNetworkDeviceSimLockChanged, lock: " << sim_lock_type_ << ", retries: " << retries_left; // There's a pending PIN operation. @@ -656,7 +659,7 @@ void SimUnlockHandler::ProcessSimCardState( const DeviceState* cellular) { std::string error_msg; if (cellular) { - uint32 retries_left = cellular->sim_retries_left(); + uint32_t retries_left = cellular->sim_retries_left(); VLOG(1) << "Current state: " << state_ << " lock_type: " << sim_lock_type_ << " retries: " << retries_left; switch (state_) { diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h index 7ad9b03..f7b03d8 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SIM_UNLOCK_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc index bdd3968..7443384 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/chromeos/slow_trace_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h index 5daaddd..bdd470b 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc index b61840a..60822e1 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc @@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.h b/chrome/browser/ui/webui/chromeos/slow_ui.h index 1a3e1b6..3ba37ae 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SLOW_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SLOW_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h index 037fa35..d3d0f46 100644 --- a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h +++ b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_TOUCH_VIEW_CONTROLLER_DELEGATE_H_ #include "ash/shell_observer.h" +#include "base/macros.h" #include "base/observer_list.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/components_ui.cc b/chrome/browser/ui/webui/components_ui.cc index a929a16..581ca6f 100644 --- a/chrome/browser/ui/webui/components_ui.cc +++ b/chrome/browser/ui/webui/components_ui.cc @@ -4,11 +4,15 @@ #include "chrome/browser/ui/webui/components_ui.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> +#include "base/macros.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/webui/components_ui.h b/chrome/browser/ui/webui/components_ui.h index f184dbe..f2e2942 100644 --- a/chrome/browser/ui/webui/components_ui.h +++ b/chrome/browser/ui/webui/components_ui.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "components/component_updater/component_updater_service.h" #include "components/update_client/crx_update_item.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index e101888..9063116 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -10,10 +10,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/enumerate_modules_model_win.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index a5ee969..46735f1 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ +#include "base/macros.h" +#include "build/build_config.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h index 973608f..fee4931 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc index 30b7cce..1b88b6c 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/values.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.h b/chrome/browser/ui/webui/constrained_web_dialog_ui.h index 62c9a8b..4f7159e 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc index 08fec2d..cc1a222 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc @@ -6,6 +6,7 @@ #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index 968f9de..3b0df4f 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc @@ -13,6 +13,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/cache_storage_context.h" @@ -66,7 +67,7 @@ const char kKeyCertType[] = "certType"; const char kKeyScopes[] = "scopes"; -const int64 kNegligibleUsage = 1024; // 1KiB +const int64_t kNegligibleUsage = 1024; // 1KiB } // namespace @@ -81,7 +82,7 @@ std::string CookiesTreeModelUtil::GetTreeNodeId(const CookieTreeNode* node) { if (iter != node_map_.end()) return base::IntToString(iter->second); - int32 new_id = id_map_.Add(node); + int32_t new_id = id_map_.Add(node); node_map_[node] = new_id; return base::IntToString(new_id); } @@ -340,7 +341,7 @@ const CookieTreeNode* CookiesTreeModelUtil::GetTreeNodeFromPath( // Validate the tree path and get the node pointer. for (const base::StringPiece& cur_node : base::SplitStringPiece( path, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { - int32 node_id = 0; + int32_t node_id = 0; if (!base::StringToInt(cur_node, &node_id)) break; diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.h b/chrome/browser/ui/webui/cookies_tree_model_util.h index 1020885..893f70e 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.h +++ b/chrome/browser/ui/webui/cookies_tree_model_util.h @@ -5,11 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_COOKIES_TREE_MODEL_UTIL_H_ #define CHROME_BROWSER_UI_WEBUI_COOKIES_TREE_MODEL_UTIL_H_ +#include <stdint.h> + #include <map> #include <string> -#include "base/basictypes.h" #include "base/id_map.h" +#include "base/macros.h" class CookieTreeNode; @@ -40,7 +42,7 @@ class CookiesTreeModelUtil { private: typedef IDMap<const CookieTreeNode> CookiesTreeNodeIdMap; - typedef std::map<const CookieTreeNode*, int32> CookieTreeNodeMap; + typedef std::map<const CookieTreeNode*, int32_t> CookieTreeNodeMap; // Populate given |dict| with cookie tree node properties. |id_map| maps // a CookieTreeNode to an ID and creates a new ID if |node| is not in the diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 5961b224..6cc6c99 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -4,11 +4,15 @@ #include "chrome/browser/ui/webui/crashes_ui.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/crash_upload_list.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/crashes_ui.h b/chrome/browser/ui/webui/crashes_ui.h index 99a678c..7292218 100644 --- a/chrome/browser/ui/webui/crashes_ui.h +++ b/chrome/browser/ui/webui/crashes_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_ #define CHROME_BROWSER_UI_WEBUI_CRASHES_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/device_log_ui.cc b/chrome/browser/ui/webui/device_log_ui.cc index 49993b4..04d325d 100644 --- a/chrome/browser/ui/webui/device_log_ui.cc +++ b/chrome/browser/ui/webui/device_log_ui.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" diff --git a/chrome/browser/ui/webui/device_log_ui.h b/chrome/browser/ui/webui/device_log_ui.h index e08a33d..cee91eb 100644 --- a/chrome/browser/ui/webui/device_log_ui.h +++ b/chrome/browser/ui/webui/device_log_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DEVICE_LOG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DEVICE_LOG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 68ccc01..1c5f89a 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/devtools_ui.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/ui/webui/devtools_ui.h b/chrome/browser/ui/webui/devtools_ui.h index 90045f1..5ee6b80 100644 --- a/chrome/browser/ui/webui/devtools_ui.h +++ b/chrome/browser/ui/webui/devtools_ui.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_DEVTOOLS_UI_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/devtools/devtools_ui_bindings.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/domain_reliability_internals_ui.h b/chrome/browser/ui/webui/domain_reliability_internals_ui.h index 401f01b..9228ea5 100644 --- a/chrome/browser/ui/webui/domain_reliability_internals_ui.h +++ b/chrome/browser/ui/webui/domain_reliability_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOMAIN_RELIABILITY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DOMAIN_RELIABILITY_INTERNALS_UI_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 6ea362e..36f0fbc 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -4,10 +4,11 @@ #include "chrome/browser/ui/webui/downloads_dom_handler.h" +#include <stddef.h> + #include <algorithm> #include <functional> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" @@ -505,7 +506,7 @@ void DownloadsDOMHandler::HandleUndo(const base::ListValue* args) { if (removals_.empty()) return; - const std::set<uint32> last_removed_ids = removals_.back(); + const std::set<uint32_t> last_removed_ids = removals_.back(); removals_.pop_back(); for (auto id : last_removed_ids) { @@ -548,7 +549,7 @@ void DownloadsDOMHandler::HandleClearAll(const base::ListValue* args) { void DownloadsDOMHandler::RemoveDownloads( const std::vector<content::DownloadItem*>& to_remove) { - std::set<uint32> ids; + std::set<uint32_t> ids; for (auto* download : to_remove) { DownloadItemModel item_model(download); @@ -606,7 +607,7 @@ content::DownloadManager* DownloadsDOMHandler::GetOriginalNotifierManager() void DownloadsDOMHandler::FinalizeRemovals() { while (!removals_.empty()) { - const std::set<uint32> remove = removals_.back(); + const std::set<uint32_t> remove = removals_.back(); removals_.pop_back(); for (const auto id : remove) { @@ -690,16 +691,16 @@ content::DownloadItem* DownloadsDOMHandler::GetDownloadByValue( return nullptr; } - uint64 id; + uint64_t id; if (!base::StringToUint64(download_id, &id)) { NOTREACHED(); return nullptr; } - return GetDownloadById(static_cast<uint32>(id)); + return GetDownloadById(static_cast<uint32_t>(id)); } -content::DownloadItem* DownloadsDOMHandler::GetDownloadById(uint32 id) { +content::DownloadItem* DownloadsDOMHandler::GetDownloadById(uint32_t id) { content::DownloadItem* item = NULL; if (GetMainNotifierManager()) item = GetMainNotifierManager()->GetDownload(id); diff --git a/chrome/browser/ui/webui/downloads_dom_handler.h b/chrome/browser/ui/webui/downloads_dom_handler.h index bf30369..1324642 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.h +++ b/chrome/browser/ui/webui/downloads_dom_handler.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_DOM_HANDLER_H_ +#include <stdint.h> + #include <set> #include <vector> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/download/all_download_item_notifier.h" #include "chrome/browser/download/download_danger_prompt.h" @@ -139,7 +142,7 @@ class DownloadsDOMHandler : public content::WebUIMessageHandler, content::DownloadItem* GetDownloadByValue(const base::ListValue* args); // Returns the download with |id| or NULL if it doesn't exist. - content::DownloadItem* GetDownloadById(uint32 id); + content::DownloadItem* GetDownloadById(uint32_t id); // Remove all downloads in |to_remove| with the ability to undo removal later. void RemoveDownloads(const std::vector<content::DownloadItem*>& to_remove); @@ -159,13 +162,13 @@ class DownloadsDOMHandler : public content::WebUIMessageHandler, scoped_ptr<AllDownloadItemNotifier> original_notifier_; // IDs of downloads to remove when this handler gets deleted. - std::vector<std::set<uint32>> removals_; + std::vector<std::set<uint32_t>> removals_; // Whether a call to SendCurrentDownloads() is currently scheduled. bool update_scheduled_; // IDs of new downloads that the page doesn't know about yet. - std::set<uint32> new_downloads_; + std::set<uint32_t> new_downloads_; base::WeakPtrFactory<DownloadsDOMHandler> weak_ptr_factory_; diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 1e0b1f1..52eadc4 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.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 <stddef.h> + #include "base/auto_reset.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/webui/downloads_ui.h b/chrome/browser/ui/webui/downloads_ui.h index 3dd0744..7ac8707 100644 --- a/chrome/browser/ui/webui/downloads_ui.h +++ b/chrome/browser/ui/webui/downloads_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.h b/chrome/browser/ui/webui/downloads_ui_browsertest.h index ef39dd4..38e718a 100644 --- a/chrome/browser/ui/webui/downloads_ui_browsertest.h +++ b/chrome/browser/ui/webui/downloads_ui_browsertest.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" // This is a helper class used by downloads_ui_browsertest.js. diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc index c606216..f1c29e8 100644 --- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc +++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" +#include "base/macros.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index 76a312b..ce6432f 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h" +#include <stddef.h> + #include <algorithm> #include <set> #include <string> diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h index 83fa88e..6bfb315 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index a2218eb..2230e3c 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index ca50b4e..4e838f9 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/favicon_service.h" diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.h b/chrome/browser/ui/webui/extensions/extension_loader_handler.h index 02415d0..f3ce533 100644 --- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc index c74bbf6..c7a3a20 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h index f04fd35..6aa02f5 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ +#include "base/macros.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/web_ui_browser_test.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index c380ede..6df7e5f 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_ +#include "base/macros.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc index 77716c4..3d852f8 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/extensions/extensions_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_loader_handler.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.h b/chrome/browser/ui/webui/extensions/extensions_ui.h index c2ca17c..ebc86e4 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.h +++ b/chrome/browser/ui/webui/extensions/extensions_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSIONS_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.h b/chrome/browser/ui/webui/extensions/install_extension_handler.h index e77d45d..265218b 100644 --- a/chrome/browser/ui/webui/extensions/install_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/install_extension_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_INSTALL_EXTENSION_HANDLER_H_ #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/fallback_icon_source.h b/chrome/browser/ui/webui/fallback_icon_source.h index bba4972..1ed29a0 100644 --- a/chrome/browser/ui/webui/fallback_icon_source.h +++ b/chrome/browser/ui/webui/fallback_icon_source.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 199d00c..29234ce 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/favicon_service.h" diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 9236565..4b7305a 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/fileicon_source.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index 6666aa3..d9d1308 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -8,6 +8,7 @@ #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/icon_manager.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/fileicon_source_unittest.cc b/chrome/browser/ui/webui/fileicon_source_unittest.cc index aef04ed..65fae98 100644 --- a/chrome/browser/ui/webui/fileicon_source_unittest.cc +++ b/chrome/browser/ui/webui/fileicon_source_unittest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/fileicon_source.h" diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index 48c7920..11a5a24 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -8,11 +8,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/ui/webui/flags_ui.h b/chrome/browser/ui/webui/flags_ui.h index 2bfb282..7741667 100644 --- a/chrome/browser/ui/webui/flags_ui.h +++ b/chrome/browser/ui/webui/flags_ui.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_FLAGS_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 9185685..fecd8ef 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/flash_ui.h" +#include <stddef.h> + #include <map> #include <string> #include <vector> @@ -11,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -19,6 +22,7 @@ #include "base/threading/thread_restrictions.h" #include "base/timer/timer.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/crash_upload_list.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/plugins/plugin_prefs.h" diff --git a/chrome/browser/ui/webui/flash_ui.h b/chrome/browser/ui/webui/flash_ui.h index 4493a6a..c567069 100644 --- a/chrome/browser/ui/webui/flash_ui.h +++ b/chrome/browser/ui/webui/flash_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_ #define CHROME_BROWSER_UI_WEBUI_FLASH_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc index ff18d1b..e731f6b 100644 --- a/chrome/browser/ui/webui/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/foreign_session_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/foreign_session_handler.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> diff --git a/chrome/browser/ui/webui/foreign_session_handler.h b/chrome/browser/ui/webui/foreign_session_handler.h index 1306a8d..91c8314 100644 --- a/chrome/browser/ui/webui/foreign_session_handler.h +++ b/chrome/browser/ui/webui/foreign_session_handler.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/time/time.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc index adcac41..a473df2 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.cc +++ b/chrome/browser/ui/webui/gcm_internals_ui.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/gcm_internals_ui.h b/chrome/browser/ui/webui/gcm_internals_ui.h index 0e2372f8..9a3b0e8 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.h +++ b/chrome/browser/ui/webui/gcm_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_GCM_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_GCM_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The WebUI for chrome://gcm-internals. diff --git a/chrome/browser/ui/webui/gesture_config_ui.h b/chrome/browser/ui/webui/gesture_config_ui.h index 48e2433..808be44 100644 --- a/chrome/browser/ui/webui/gesture_config_ui.h +++ b/chrome/browser/ui/webui/gesture_config_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_GESTURE_CONFIG_UI_H_ #define CHROME_BROWSER_UI_WEBUI_GESTURE_CONFIG_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace base { diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 2f78c34..a449b65 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -4,21 +4,24 @@ #include "chrome/browser/ui/webui/help/help_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/obsolete_system/obsolete_system.h" diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h index 14bfa40..7679882 100644 --- a/chrome/browser/ui/webui/help/help_handler.h +++ b/chrome/browser/ui/webui/help/help_handler.h @@ -8,8 +8,10 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" +#include "build/build_config.h" #include "chrome/browser/ui/webui/help/version_updater.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/webui/help/help_ui.h b/chrome/browser/ui/webui/help/help_ui.h index f066c66..c2b8aca 100644 --- a/chrome/browser/ui/webui/help/help_ui.h +++ b/chrome/browser/ui/webui/help/help_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_HELP_HELP_UI_H_ #define CHROME_BROWSER_UI_WEBUI_HELP_HELP_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class HelpUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc index 7896f0c..d370f93 100644 --- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc +++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h" diff --git a/chrome/browser/ui/webui/help/version_updater.h b/chrome/browser/ui/webui/help/version_updater.h index cd2966c..ca978dc 100644 --- a/chrome/browser/ui/webui/help/version_updater.h +++ b/chrome/browser/ui/webui/help/version_updater.h @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/strings/string16.h" +#include "build/build_config.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/webui/help/version_updater_basic.h b/chrome/browser/ui/webui/help/version_updater_basic.h index fab6793..4ba7d2f 100644 --- a/chrome/browser/ui/webui/help/version_updater_basic.h +++ b/chrome/browser/ui/webui/help/version_updater_basic.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_BASIC_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/help/version_updater.h" // Bare bones implementation just checks if a new version is ready. diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.h b/chrome/browser/ui/webui/help/version_updater_chromeos.h index 307f512..426f700 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.h +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_CHROMEOS_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/help/version_updater.h" #include "chromeos/dbus/update_engine_client.h" diff --git a/chrome/browser/ui/webui/help/version_updater_mac.h b/chrome/browser/ui/webui/help/version_updater_mac.h index 3f5df5d..7b46b1e 100644 --- a/chrome/browser/ui/webui/help/version_updater_mac.h +++ b/chrome/browser/ui/webui/help/version_updater_mac.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/help/version_updater.h" @class KeystoneObserver; diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 7195f4c..fd14cc6 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -9,6 +9,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/history/web_history_service_factory.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index 10f2554..0b576bc 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc index e83a27c..0d2aa2b 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.cc +++ b/chrome/browser/ui/webui/identity_internals_ui.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/identity/identity_api.h" diff --git a/chrome/browser/ui/webui/identity_internals_ui.h b/chrome/browser/ui/webui/identity_internals_ui.h index 600ea1e..58a4435 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.h +++ b/chrome/browser/ui/webui/identity_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class IdentityInternalsUITest; diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h index c5cba66..ab9dd46 100644 --- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" class IdentityInternalsUIBrowserTest : public WebUIBrowserTest { diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index b10ce97..850b66b 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/inspect_ui.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "chrome/browser/devtools/devtools_target_impl.h" diff --git a/chrome/browser/ui/webui/inspect_ui.h b/chrome/browser/ui/webui/inspect_ui.h index 2d3fc8d..329e71c 100644 --- a/chrome/browser/ui/webui/inspect_ui.h +++ b/chrome/browser/ui/webui/inspect_ui.h @@ -7,6 +7,7 @@ #include <map> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index 1286acb..e2ae3c6 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.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 "chrome/browser/devtools/device/adb/adb_device_provider.h" #include "chrome/browser/devtools/device/adb/mock_adb_server.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h" diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc index 162ac8c..c23ae88 100644 --- a/chrome/browser/ui/webui/instant_ui.cc +++ b/chrome/browser/ui/webui/instant_ui.cc @@ -4,10 +4,14 @@ #include "chrome/browser/ui/webui/instant_ui.h" +#include <stdint.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -34,7 +38,7 @@ content::WebUIDataSource* CreateInstantHTMLSource() { } #if !defined(OS_ANDROID) -std::string FormatTime(int64 time) { +std::string FormatTime(int64_t time) { base::Time::Exploded exploded; base::Time::FromInternalValue(time).UTCExplode(&exploded); return base::StringPrintf("%04d-%02d-%02d %02d:%02d:%02d.%03d", @@ -116,7 +120,7 @@ void InstantUIMessageHandler::SetPreferenceValue(const base::ListValue* args) { void InstantUIMessageHandler::GetDebugInfo(const base::ListValue* args) { #if !defined(OS_ANDROID) - typedef std::pair<int64, std::string> DebugEvent; + typedef std::pair<int64_t, std::string> DebugEvent; if (!web_ui()->GetWebContents()) return; diff --git a/chrome/browser/ui/webui/instant_ui.h b/chrome/browser/ui/webui/instant_ui.h index 0a0bd0b..c0d543b 100644 --- a/chrome/browser/ui/webui/instant_ui.h +++ b/chrome/browser/ui/webui/instant_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_INSTANT_UI_H_ #define CHROME_BROWSER_UI_WEBUI_INSTANT_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc index 5fdc9a5..b71f6d2 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.h b/chrome/browser/ui/webui/interstitials/interstitial_ui.h index c474306..933a52e 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.h +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations_message_handler.h index e5fe779..78e1e2f 100644 --- a/chrome/browser/ui/webui/invalidations_message_handler.h +++ b/chrome/browser/ui/webui/invalidations_message_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_MESSAGE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/invalidations_ui.h b/chrome/browser/ui/webui/invalidations_ui.h index 42a5d94..f4a9cf4 100644 --- a/chrome/browser/ui/webui/invalidations_ui.h +++ b/chrome/browser/ui/webui/invalidations_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://invalidations page. diff --git a/chrome/browser/ui/webui/large_icon_source.h b/chrome/browser/ui/webui/large_icon_source.h index fb573ea..b01a6e5 100644 --- a/chrome/browser/ui/webui/large_icon_source.h +++ b/chrome/browser/ui/webui/large_icon_source.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/fallback_icon_service.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc index b676af7..efc476a 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h index 069030f..9abff5f 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ #define CHROME_BROWSER_UI_WEBUI_LOCAL_DISCOVERY_LOCAL_DISCOVERY_UI_H_ +#include "base/macros.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 264c7c3..d097829 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -2,14 +2,17 @@ // 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 <stdint.h> + #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/test_service_discovery_client.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -53,7 +56,7 @@ namespace local_discovery { namespace { -const uint8 kQueryData[] = { +const uint8_t kQueryData[] = { // Header 0x00, 0x00, 0x00, 0x00, // Flags not set. @@ -73,7 +76,7 @@ const uint8 kQueryData[] = { 0x00, 0x01, // QCLASS: IN class. Unicast bit not set. }; -const uint8 kAnnouncePacket[] = { +const uint8_t kAnnouncePacket[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, no error @@ -148,7 +151,7 @@ const uint8 kAnnouncePacket[] = { }; -const uint8 kGoodbyePacket[] = { +const uint8_t kGoodbyePacket[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, RA, no error @@ -185,7 +188,7 @@ const uint8 kGoodbyePacket[] = { 0x00, }; -const uint8 kAnnouncePacketRegistered[] = { +const uint8_t kAnnouncePacketRegistered[] = { // Header 0x00, 0x00, // ID is zeroed out 0x80, 0x00, // Standard query response, RA, no error diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 1568401..04a8a03 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -12,6 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/cloud_device_list.h" #include "chrome/browser/local_discovery/privet_confirm_api_flow.h" #include "chrome/browser/local_discovery/privet_constants.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h index fbe0d78..2873c45 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h @@ -9,6 +9,8 @@ #include <string> #include <vector> +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/local_discovery/cloud_print_printer_list.h" #include "chrome/browser/local_discovery/privet_device_lister.h" #include "chrome/browser/local_discovery/privet_http.h" diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc index 13f4776..9b4a864 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.cc +++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc @@ -7,7 +7,9 @@ #include <string> #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.h b/chrome/browser/ui/webui/local_state/local_state_ui.h index 4af8226..e845dae 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.h +++ b/chrome/browser/ui/webui/local_state/local_state_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_LOCAL_STATE_LOCAL_STATE_UI_H_ #define CHROME_BROWSER_UI_WEBUI_LOCAL_STATE_LOCAL_STATE_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // Controller for chrome://local-state/ page. diff --git a/chrome/browser/ui/webui/log_web_ui_url.cc b/chrome/browser/ui/webui/log_web_ui_url.cc index 6f983ff..9679ab1 100644 --- a/chrome/browser/ui/webui/log_web_ui_url.cc +++ b/chrome/browser/ui/webui/log_web_ui_url.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/log_web_ui_url.h" +#include <stdint.h> + #include "base/hash.h" #include "base/metrics/histogram_base.h" #include "base/metrics/sparse_histogram.h" @@ -30,7 +32,7 @@ bool LogWebUIUrl(const GURL& web_ui_url) { #endif if (should_log) { - uint32 hash = base::Hash(web_ui_url.GetOrigin().spec()); + uint32_t hash = base::Hash(web_ui_url.GetOrigin().spec()); UMA_HISTOGRAM_SPARSE_SLOWLY(kWebUICreatedForUrl, static_cast<base::HistogramBase::Sample>(hash)); } diff --git a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc index 60c8304..bdd3701 100644 --- a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc +++ b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc @@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/log_web_ui_url.h" +#include <stdint.h> + #include <vector> #include "base/hash.h" +#include "base/macros.h" #include "base/test/histogram_tester.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -46,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestHistoryFrame) { ui_test_utils::NavigateToURL(browser(), history_frame_url); - uint32 history_frame_url_hash = base::Hash(history_frame_url.spec()); + uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1))); chrome::Reload(browser(), CURRENT_TAB); @@ -69,13 +72,13 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { std::string scheme(content::kChromeUIScheme); GURL uber_url(scheme + "://" + chrome::kChromeUIUberHost); - uint32 uber_url_hash = base::Hash(uber_url.spec()); + uint32_t uber_url_hash = base::Hash(uber_url.spec()); GURL uber_frame_url(chrome::kChromeUIUberFrameURL); - uint32 uber_frame_url_hash = base::Hash(uber_frame_url.spec()); + uint32_t uber_frame_url_hash = base::Hash(uber_frame_url.spec()); GURL history_frame_url(chrome::kChromeUIHistoryFrameURL); - uint32 history_frame_url_hash = base::Hash(history_frame_url.spec()); + uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1), Bucket(uber_frame_url_hash, 1), @@ -103,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { } GURL extensions_frame_url(chrome::kChromeUIExtensionsFrameURL); - uint32 extensions_frame_url_hash = base::Hash(extensions_frame_url.spec()); + uint32_t extensions_frame_url_hash = base::Hash(extensions_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(extensions_frame_url_hash, 1), Bucket(history_frame_url_hash, 2), diff --git a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h index eced8d4..2b45bf1 100644 --- a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h +++ b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_DOWNLOADS_LIST_TRACKER_H_ #define CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_DOWNLOADS_LIST_TRACKER_H_ +#include <stddef.h> + #include <set> #include "base/callback_forward.h" diff --git a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc index 2d9c1ee..3e9d0a8 100644 --- a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc +++ b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/md_downloads/downloads_list_tracker.h" +#include <stdint.h> + #include <vector> #include "base/files/file_path.h" @@ -27,20 +29,20 @@ using testing::Return; namespace { -uint64 GetId(const base::Value* value) { +uint64_t GetId(const base::Value* value) { const base::DictionaryValue* dict; CHECK(value->GetAsDictionary(&dict)); int id; CHECK(dict->GetInteger("id", &id)); CHECK_GE(id, 0); - return static_cast<uint64>(id); + return static_cast<uint64_t>(id); } -std::vector<uint64> GetIds(const base::Value* value) { +std::vector<uint64_t> GetIds(const base::Value* value) { CHECK(value); - std::vector<uint64> ids; + std::vector<uint64_t> ids; if (value->GetType() == base::Value::TYPE_LIST) { const base::ListValue* list; @@ -85,7 +87,7 @@ class TestDownloadsListTracker : public DownloadsListTracker { scoped_ptr<base::DictionaryValue> CreateDownloadItemValue( content::DownloadItem* item) const override { scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); - CHECK_LE(item->GetId(), static_cast<uint64>(INT_MAX)); + CHECK_LE(item->GetId(), static_cast<uint64_t>(INT_MAX)); dict->SetInteger("id", item->GetId()); return dict.Pass(); } @@ -109,7 +111,7 @@ class DownloadsListTrackerTest : public testing::Test { testing::Invoke(this, &DownloadsListTrackerTest::GetAllDownloads)); } - MockDownloadItem* CreateMock(uint64 id, const base::Time& started) { + MockDownloadItem* CreateMock(uint64_t id, const base::Time& started) { MockDownloadItem* new_item = new testing::NiceMock<MockDownloadItem>(); mock_items_.push_back(new_item); @@ -182,7 +184,7 @@ TEST_F(DownloadsListTrackerTest, StartCallsInsertItems) { web_ui()->call_data()[0]->function_name()); EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1())); - std::vector<uint64> ids = GetIds(web_ui()->call_data()[0]->arg2()); + std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2()); ASSERT_FALSE(ids.empty()); EXPECT_EQ(first_item->GetId(), ids[0]); } @@ -218,7 +220,7 @@ TEST_F(DownloadsListTrackerTest, OnDownloadCreatedCallsInsertItems) { web_ui()->call_data()[0]->function_name()); EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1())); - std::vector<uint64> ids = GetIds(web_ui()->call_data()[0]->arg2()); + std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2()); ASSERT_FALSE(ids.empty()); EXPECT_EQ(first_item->GetId(), ids[0]); } diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc index ce116d5..8a811f4 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <functional> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" @@ -389,16 +388,16 @@ content::DownloadItem* MdDownloadsDOMHandler::GetDownloadByValue( return nullptr; } - uint64 id; + uint64_t id; if (!base::StringToUint64(download_id, &id)) { NOTREACHED(); return nullptr; } - return GetDownloadById(static_cast<uint32>(id)); + return GetDownloadById(static_cast<uint32_t>(id)); } -content::DownloadItem* MdDownloadsDOMHandler::GetDownloadById(uint32 id) { +content::DownloadItem* MdDownloadsDOMHandler::GetDownloadById(uint32_t id) { content::DownloadItem* item = NULL; if (GetMainNotifierManager()) item = GetMainNotifierManager()->GetDownload(id); diff --git a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h index a724d6d..02577e8 100644 --- a/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h +++ b/chrome/browser/ui/webui/md_downloads/md_downloads_dom_handler.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_MD_DOWNLOADS_DOM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_MD_DOWNLOADS_MD_DOWNLOADS_DOM_HANDLER_H_ +#include <stdint.h> + #include <set> #include <vector> @@ -92,7 +94,7 @@ class MdDownloadsDOMHandler : public content::WebUIMessageHandler { void FinalizeRemovals(); private: - using IdSet = std::set<uint32>; + using IdSet = std::set<uint32_t>; using DownloadVector = std::vector<content::DownloadItem*>; // Convenience method to call |main_notifier_->GetManager()| while @@ -123,7 +125,7 @@ class MdDownloadsDOMHandler : public content::WebUIMessageHandler { content::DownloadItem* GetDownloadByValue(const base::ListValue* args); // Returns the download with |id| or NULL if it doesn't exist. - content::DownloadItem* GetDownloadById(uint32 id); + content::DownloadItem* GetDownloadById(uint32_t id); // Remove all downloads in |to_remove| with the ability to undo removal later. void RemoveDownloads(const DownloadVector& to_remove); diff --git a/chrome/browser/ui/webui/md_history_ui.cc b/chrome/browser/ui/webui/md_history_ui.cc index 8b9100df..31c7ecd 100644 --- a/chrome/browser/ui/webui/md_history_ui.cc +++ b/chrome/browser/ui/webui/md_history_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/md_history_ui.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/browsing_history_handler.h" #include "chrome/browser/ui/webui/metrics_handler.h" diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index fab1fbe..98125cb 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc @@ -9,12 +9,14 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media/webrtc_log_list.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.h b/chrome/browser/ui/webui/media/webrtc_logs_ui.h index c2e7ee1..8cbc70d 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.h +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_WEBRTC_LOGS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_MEDIA_WEBRTC_LOGS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc index 138ae3e..f43aadb 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc @@ -7,7 +7,9 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/media/router/presentation_service_delegate_impl.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/toolbar/media_router_action.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc index bb81b9a..620f34e 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.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 "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc index 617538f..29c5c5b 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_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 "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_test.h b/chrome/browser/ui/webui/media_router/media_router_test.h index f63c5eb..512aa29 100644 --- a/chrome/browser/ui/webui/media_router/media_router_test.h +++ b/chrome/browser/ui/webui/media_router/media_router_test.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_TEST_H_ #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_TEST_H_ +#include "base/macros.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc index cbb4eab..cda8494 100644 --- a/chrome/browser/ui/webui/media_router/media_router_ui.cc +++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc @@ -9,6 +9,7 @@ #include "base/guid.h" #include "base/i18n/string_compare.h" +#include "base/macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc index 487e4d8..d721bbc 100644 --- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc +++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_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/strings/stringprintf.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.h b/chrome/browser/ui/webui/media_router/query_result_manager.h index 93f1808..f355b07 100644 --- a/chrome/browser/ui/webui/media_router/query_result_manager.h +++ b/chrome/browser/ui/webui/media_router/query_result_manager.h @@ -10,6 +10,7 @@ #include <vector> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" diff --git a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc index 0483852..2918454 100644 --- a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc +++ b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc @@ -5,6 +5,7 @@ #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/media/router/media_sinks_observer.h" #include "chrome/browser/media/router/media_source_helper.h" diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h b/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h index 9b7ef31..9324998 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc index 5ce9a26..08515fd 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.cc @@ -11,6 +11,7 @@ #include <vector> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h index 56f835b..af15813 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_PROXY_H_ #define CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_PROXY_H_ +#include <stddef.h> + #include <set> #include <string> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" diff --git a/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h b/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h index 3738a07..ba9c3de 100644 --- a/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h +++ b/chrome/browser/ui/webui/memory_internals/memory_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_MEMORY_INTERNALS_MEMORY_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class MemoryInternalsUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 41a6c08..0efe7c9 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc @@ -10,6 +10,7 @@ #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" #include "chrome/common/ntp_logging_events.h" diff --git a/chrome/browser/ui/webui/metrics_handler.h b/chrome/browser/ui/webui/metrics_handler.h index 7fe8db0..07eb7d0 100644 --- a/chrome/browser/ui/webui/metrics_handler.h +++ b/chrome/browser/ui/webui/metrics_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_METRICS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_message_handler.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h index 9b2e7cc..253971e 100644 --- a/chrome/browser/ui/webui/mojo_web_ui_controller.h +++ b/chrome/browser/ui/webui/mojo_web_ui_controller.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 183cfa6..46171ff 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/nacl_ui.h" +#include <stddef.h> + #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/strings/string16.h" @@ -19,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/channel_info.h" diff --git a/chrome/browser/ui/webui/nacl_ui.h b/chrome/browser/ui/webui/nacl_ui.h index 3971b4d..472b68c 100644 --- a/chrome/browser/ui/webui/nacl_ui.h +++ b/chrome/browser/ui/webui/nacl_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NACL_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NACL_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The Web UI handler for about:nacl. diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc index f5de774..610d006 100644 --- a/chrome/browser/ui/webui/net_export_ui.cc +++ b/chrome/browser/ui/webui/net_export_ui.cc @@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/net_export_ui.h b/chrome/browser/ui/webui/net_export_ui.h index 862fd53..cb58382 100644 --- a/chrome/browser/ui/webui/net_export_ui.h +++ b/chrome/browser/ui/webui/net_export_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_EXPORT_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NET_EXPORT_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The C++ back-end for the chrome://net-export webui page. diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index d27928a..de13575 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" +#include <stddef.h> + #include <algorithm> #include <list> #include <string> @@ -17,6 +19,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_member.h" @@ -27,6 +30,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.h b/chrome/browser/ui/webui/net_internals/net_internals_ui.h index 59b0e9c..9349ef0 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.h +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.h @@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class NetInternalsUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 852a7b0..4ff6414 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h index 6c54e6d..791a0e2 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_ +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/web_ui_browser_test.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index e4c3121..44be513 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" +#include <stddef.h> + #include <vector> #include "apps/metrics_names.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 493b876..3ab612c 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -9,6 +9,7 @@ #include <string> #include "apps/metrics_names.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/task/cancelable_task_tracker.h" diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h index 3db6cdb..584b239 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 27e71a4..4f40fdc 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index 6d0e29d..2c5209b 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon_base/favicon_types.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h index ec2b291..ce4a5b5 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_HANDLER_H_ +#include <stddef.h> + +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index d3e8d85..7b04403 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/sync/sync_ui_util.h" #include "components/browser_sync/browser/profile_sync_service.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 9bf5357..97886fe 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/time/time.h" #include "base/timer/timer.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index b6af137..37be5577 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.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 "base/command_line.h" #include "base/logging.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index f9b7068..df78320 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -15,6 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_util.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index 627e1f1..df898d6 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h index af3c6f8..d3c38b4 100644 --- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h +++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.h @@ -5,9 +5,12 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_USER_DATA_LOGGER_H_ +#include <stddef.h> + #include <string> #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "chrome/common/ntp_logging_events.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc index e6493f1..8f9b9bc 100644 --- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc +++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" -#include "base/basictypes.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui.h b/chrome/browser/ui/webui/omnibox/omnibox_ui.h index c91af32..d853ba7 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/mojo_web_ui_controller.h" #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index ec18ff9..6d2792f 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" +#include <stddef.h> + #include <string> #include "base/auto_reset.h" @@ -83,7 +85,7 @@ struct TypeConverter<AutocompleteMatchMojoPtr, AutocompleteMatch> { mojo::String::From(input.associated_keyword->keyword); } result->keyword = mojo::String::From(input.keyword); - result->duplicates = static_cast<int32>(input.duplicate_matches.size()); + result->duplicates = static_cast<int32_t>(input.duplicate_matches.size()); result->from_previous = input.from_previous; result->additional_info = diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h index 15158da..e4e2390 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h @@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils.h b/chrome/browser/ui/webui/options/advanced_options_utils.h index 1b77da7..654df0b 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils.h +++ b/chrome/browser/ui/webui/options/advanced_options_utils.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_UTILS_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc index e509a13..cd54152 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_linux.cc @@ -6,6 +6,8 @@ #include "chrome/browser/ui/webui/options/advanced_options_utils.h" +#include <stddef.h> + #include "base/bind.h" #include "base/environment.h" #include "base/files/file_path.h" @@ -14,6 +16,7 @@ #include "base/process/launch.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/browser/tab_contents/tab_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc index 4f0f8a0..7c5c16c 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc @@ -12,6 +12,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/threading/thread.h" diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index 84540ad..f9d5531 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/autofill_options_handler.h" +#include <stddef.h> + #include <vector> #include "base/bind.h" @@ -11,6 +13,7 @@ #include "base/command_line.h" #include "base/guid.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h index b569cb6..58d51e9 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.h +++ b/chrome/browser/ui/webui/options/autofill_options_handler.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/autofill/core/browser/personal_data_manager_observer.h" diff --git a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc index 22a81c3..14d67bd 100644 --- a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc +++ b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/time/time.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h index ecbfee4..1b4baed 100644 --- a/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h +++ b/chrome/browser/ui/webui/options/automatic_settings_reset_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOMATIC_SETTINGS_RESET_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_AUTOMATIC_SETTINGS_RESET_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index b93c86c..b29ae74 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/browser_options_handler.h" +#include <stddef.h> + #include <set> #include <string> #include <vector> @@ -12,6 +14,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" @@ -22,6 +25,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/custom_home_pages_table_model.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 3644e9e..31bc320 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -7,14 +7,15 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_member.h" #include "base/scoped_observer.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/shell_integration.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc index 881eec7..d68ae7f 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" #include "components/policy/core/browser/browser_policy_connector.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 02ff477..5138a67 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -5,6 +5,8 @@ #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" #include <errno.h> +#include <stddef.h> +#include <stdint.h> #include <algorithm> #include <map> @@ -14,11 +16,13 @@ #include "base/files/file_util.h" // for FileAccessProvider #include "base/i18n/string_compare.h" #include "base/id_map.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/profiles/profile.h" @@ -157,7 +161,7 @@ class CertIdMap { net::X509Certificate* CallbackArgsToCert(const base::ListValue* args); private: - typedef std::map<net::X509Certificate*, int32> CertMap; + typedef std::map<net::X509Certificate*, int32_t> CertMap; // Creates an ID for cert and looks up the cert for an ID. IDMap<net::X509Certificate>id_map_; @@ -173,13 +177,13 @@ std::string CertIdMap::CertToId(net::X509Certificate* cert) { if (iter != cert_map_.end()) return base::IntToString(iter->second); - int32 new_id = id_map_.Add(cert); + int32_t new_id = id_map_.Add(cert); cert_map_[cert] = new_id; return base::IntToString(new_id); } net::X509Certificate* CertIdMap::IdToCert(const std::string& id) { - int32 cert_id = 0; + int32_t cert_id = 0; if (!base::StringToInt(id, &cert_id)) return NULL; diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index 948c3bb..bf60244 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc index 3dcb20f..446ff3d 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/login/login_manager_test.h" #include "chrome/browser/chromeos/login/startup_utils.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc index ada7049..140c31d 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" +#include <stddef.h> + #include <string> #include "base/bind.h" diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h index 8b814d2..83212bb 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ACCOUNTS_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc index 1defd65..ddff2c1 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc @@ -8,6 +8,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h index cd17609..6042abb 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h index 80ca836..a7814e9 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/chromeos/camera_presence_notifier.h" #include "chrome/browser/image_decoder.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index daed4a8..6b0b6f8 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h" +#include <stddef.h> + #include <string> #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index c968cf4..3a05c24 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h b/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h index f0cfefb..8313d8a 100644 --- a/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DATE_TIME_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chromeos/dbus/system_clock_client.h" diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc index 61de2c1..0ece958 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" +#include <stddef.h> +#include <stdint.h> + #include <string> #include "ash/display/display_configurator_animation.h" @@ -38,7 +41,7 @@ DisplayManager* GetDisplayManager() { return ash::Shell::GetInstance()->display_manager(); } -int64 GetDisplayId(const base::ListValue* args) { +int64_t GetDisplayId(const base::ListValue* args) { // Assumes the display ID is specified as the first argument. std::string id_value; if (!args->GetString(0, &id_value)) { @@ -46,7 +49,7 @@ int64 GetDisplayId(const base::ListValue* args) { return gfx::Display::kInvalidDisplayID; } - int64 display_id = gfx::Display::kInvalidDisplayID; + int64_t display_id = gfx::Display::kInvalidDisplayID; if (!base::StringToInt64(id_value, &display_id)) { LOG(ERROR) << "Invalid display id: " << id_value; return gfx::Display::kInvalidDisplayID; @@ -122,7 +125,7 @@ bool ConvertValueToDisplayMode(const base::DictionaryValue* dict, return true; } -base::DictionaryValue* ConvertDisplayModeToValue(int64 display_id, +base::DictionaryValue* ConvertDisplayModeToValue(int64_t display_id, const ash::DisplayMode& mode) { bool is_internal = gfx::Display::HasInternalDisplay() && gfx::Display::InternalDisplayId() == display_id; @@ -273,7 +276,7 @@ void DisplayOptionsHandler::SendDisplayInfo( (display_manager->IsInUnifiedMode() ? DisplayManager::UNIFIED : DisplayManager::EXTENDED)); - int64 primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); + int64_t primary_id = ash::Shell::GetScreen()->GetPrimaryDisplay().id(); base::ListValue js_displays; for (const gfx::Display& display : displays) { const ash::DisplayInfo& display_info = @@ -371,7 +374,7 @@ void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) { void DisplayOptionsHandler::HandleSetPrimary(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -402,7 +405,7 @@ void DisplayOptionsHandler::HandleDisplayLayout(const base::ListValue* args) { void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -432,7 +435,7 @@ void DisplayOptionsHandler::HandleSetDisplayMode(const base::ListValue* args) { void DisplayOptionsHandler::HandleSetOrientation(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; @@ -459,7 +462,7 @@ void DisplayOptionsHandler::HandleSetOrientation(const base::ListValue* args) { void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) { DCHECK(!args->empty()); - int64 display_id = GetDisplayId(args); + int64_t display_id = GetDisplayId(args); if (display_id == gfx::Display::kInvalidDisplayID) return; diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.h b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h index 4dc3f4b..33c4df7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h @@ -8,6 +8,7 @@ #include <vector> #include "ash/display/window_tree_host_manager.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc index c223168..57e12a7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc @@ -102,7 +102,7 @@ void DisplayOverscanHandler::OnDisplayMetricsChanged(const gfx::Display&, } void DisplayOverscanHandler::HandleStart(const base::ListValue* args) { - int64 display_id = gfx::Display::kInvalidDisplayID; + int64_t display_id = gfx::Display::kInvalidDisplayID; std::string id_value; if (!args->GetString(0, &id_value)) { LOG(ERROR) << "Can't find ID"; diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h index 2f1cc51..f3f60c7 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OVERSCAN_HANDLER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/gfx/display_observer.h" diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index c5d39f0..1bf90c7 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h index d3c7da2..19dba2a 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc index 8d788cc..69e179b 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.h" +#include <stddef.h> + #include "base/macros.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc index 563342e..0a4594e 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc @@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" +#include <stddef.h> + #include "ash/new_window_delegate.h" #include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h index eeb2ffdb..2ae8c5f 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KEYBOARD_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/events/devices/input_device_event_observer.h" diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc index 4390f78..5d85ee4 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h index 091c9cd..0dc6e93 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_POINTER_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/system/pointer_device_observer.h" diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index cab3591..8b05e34 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h index bc3e62ed..4280207 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_PROXY_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index 1055a8d..af5da3e 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/login/login_manager_test.h" diff --git a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h index be2a719..8c95f11 100644 --- a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_STATS_OPTIONS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h index b83a3c7..5bc156c 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.h +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/url_data_source.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc index a97cb82..9e0973b 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc @@ -2,7 +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 "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc index b14ec95..df0e607 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc @@ -4,10 +4,12 @@ #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" -#include "base/basictypes.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.h b/chrome/browser/ui/webui/options/clear_browser_data_handler.h index ea1e7dc..6a09ab6 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.h +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_member.h" #include "chrome/browser/browsing_data/browsing_data_counter.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 278f493..f26c435 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/content_settings_handler.h" +#include <stddef.h> + #include <algorithm> #include <map> #include <vector> @@ -12,11 +14,13 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" @@ -817,7 +821,7 @@ void ContentSettingsHandler::Observe( } void ContentSettingsHandler::OnGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) { diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 0b2c38c..01ae9d78 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -5,8 +5,11 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ +#include <stdint.h> + #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" @@ -55,7 +58,7 @@ class ContentSettingsHandler : public OptionsPageUIHandler, // PepperFlashSettingsManager::Client implementation. void OnGetPermissionSettingsCompleted( - uint32 request_id, + uint32_t request_id, bool success, PP_Flash_BrowserOperations_Permission default_permission, const ppapi::FlashSiteSettings& sites) override; diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc index 9567b42..17ea9d7 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.cc +++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.h b/chrome/browser/ui/webui/options/cookies_view_handler.h index 319abca..fcfefd4 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.h +++ b/chrome/browser/ui/webui/options/cookies_view_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index a54bd13..b15d207 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/core_options_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/json/json_reader.h" @@ -12,6 +14,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index e5e5bc2..5b49bfa 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -9,6 +9,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/create_profile_handler.cc b/chrome/browser/ui/webui/options/create_profile_handler.cc index 21d6a53..a85a4f4 100644 --- a/chrome/browser/ui/webui/options/create_profile_handler.cc +++ b/chrome/browser/ui/webui/options/create_profile_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/create_profile_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/ui/webui/options/create_profile_handler.h b/chrome/browser/ui/webui/options/create_profile_handler.h index 6ee91ba..cb017fa 100644 --- a/chrome/browser/ui/webui/options/create_profile_handler.h +++ b/chrome/browser/ui/webui/options/create_profile_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CREATE_PROFILE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CREATE_PROFILE_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/options/easy_unlock_handler.cc b/chrome/browser/ui/webui/options/easy_unlock_handler.cc index ccde01b..c352b23 100644 --- a/chrome/browser/ui/webui/options/easy_unlock_handler.cc +++ b/chrome/browser/ui/webui/options/easy_unlock_handler.cc @@ -7,6 +7,7 @@ #include <string> #include "base/bind.h" +#include "base/macros.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/easy_unlock_service.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 690e053..d6d86a2 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -4,17 +4,20 @@ #include "chrome/browser/ui/webui/options/font_settings_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/options/font_settings_utils.h b/chrome/browser/ui/webui/options/font_settings_utils.h index 032aaca..b800f25 100644 --- a/chrome/browser/ui/webui/options/font_settings_utils.h +++ b/chrome/browser/ui/webui/options/font_settings_utils.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_UTILS_H_ -#include "base/basictypes.h" +#include "base/macros.h" class PrefService; diff --git a/chrome/browser/ui/webui/options/geolocation_options_handler.h b/chrome/browser/ui/webui/options/geolocation_options_handler.h index 7f0993d..f3ce970 100644 --- a/chrome/browser/ui/webui/options/geolocation_options_handler.h +++ b/chrome/browser/ui/webui/options/geolocation_options_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_GEOLOCATION_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_GEOLOCATION_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index 8b11fe8..7958f35 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/handler_options_handler.h b/chrome/browser/ui/webui/options/handler_options_handler.h index aa33128..f1b49ac 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.h +++ b/chrome/browser/ui/webui/options/handler_options_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/common/custom_handlers/protocol_handler.h" diff --git a/chrome/browser/ui/webui/options/help_overlay_handler.h b/chrome/browser/ui/webui/options/help_overlay_handler.h index b216132..08b9973 100644 --- a/chrome/browser/ui/webui/options/help_overlay_handler.h +++ b/chrome/browser/ui/webui/options/help_overlay_handler.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_HELP_OVERLAY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_HELP_OVERLAY_HANDLER_H_ -#include "base/basictypes.h" #include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.h b/chrome/browser/ui/webui/options/home_page_overlay_handler.h index 36fce27..f359750 100644 --- a/chrome/browser/ui/webui/options/home_page_overlay_handler.h +++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_HOME_PAGE_OVERLAY_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_HOME_PAGE_OVERLAY_HANDLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "components/omnibox/browser/autocomplete_controller_delegate.h" diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index e0df006..481b323 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc @@ -4,11 +4,13 @@ #include "chrome/browser/ui/webui/options/import_data_handler.h" +#include <stddef.h> + #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -99,7 +101,7 @@ void ImportDataHandler::RegisterMessages() { void ImportDataHandler::StartImport( const importer::SourceProfile& source_profile, - uint16 imported_items) { + uint16_t imported_items) { DCHECK_CURRENTLY_ON(BrowserThread::UI); if (!imported_items) @@ -137,7 +139,7 @@ void ImportDataHandler::ImportData(const base::ListValue* args) { return; } - uint16 selected_items = importer::NONE; + uint16_t selected_items = importer::NONE; if (args->GetString(1, &string_value) && string_value == "true") { selected_items |= importer::HISTORY; } @@ -156,9 +158,9 @@ void ImportDataHandler::ImportData(const base::ListValue* args) { const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(browser_index); - uint16 supported_items = source_profile.services_supported; + uint16_t supported_items = source_profile.services_supported; - uint16 imported_items = (selected_items & supported_items); + uint16_t imported_items = (selected_items & supported_items); if (imported_items) { StartImport(source_profile, imported_items); } else { @@ -174,7 +176,7 @@ void ImportDataHandler::InitializePage() { for (size_t i = 0; i < importer_list_->count(); ++i) { const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(i); - uint16 browser_services = source_profile.services_supported; + uint16_t browser_services = source_profile.services_supported; base::DictionaryValue* browser_profile = new base::DictionaryValue(); browser_profile->SetString("name", source_profile.importer_name); diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h index ec9da8d..99c9902 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.h +++ b/chrome/browser/ui/webui/options/import_data_handler.h @@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_IMPORT_DATA_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" @@ -36,7 +38,7 @@ class ImportDataHandler : public OptionsPageUIHandler, private: void StartImport(const importer::SourceProfile& source_profile, - uint16 imported_items); + uint16_t imported_items); void ImportData(const base::ListValue* args); diff --git a/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc b/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc index 04cbf0a..7a6a5cb 100644 --- a/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc +++ b/chrome/browser/ui/webui/options/language_dictionary_interactive_uitest.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index 2c0e835..0b45d66 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc @@ -4,12 +4,13 @@ #include "chrome/browser/ui/webui/options/language_options_handler.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler.h b/chrome/browser/ui/webui/options/language_options_handler.h index 567e8f6..4172579 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.h +++ b/chrome/browser/ui/webui/options/language_options_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/language_options_handler_common.h" namespace options { diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc index 3764687..680df95 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc @@ -4,20 +4,23 @@ #include "chrome/browser/ui/webui/options/language_options_handler_common.h" +#include <stddef.h> + #include <map> #include <string> #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.h b/chrome/browser/ui/webui/options/language_options_handler_common.h index a0ba10e..1b94a67 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.h +++ b/chrome/browser/ui/webui/options/language_options_handler_common.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_LANGUAGE_OPTIONS_HANDLER_COMMON_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc index a67121f..5a4ed59 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc @@ -7,6 +7,7 @@ #include <string> #include "base/values.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #if !defined(OS_MACOSX) diff --git a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc index e12ad8c..051fe12 100644 --- a/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc +++ b/chrome/browser/ui/webui/options/language_options_interactive_uitest.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index f2aa14c..6e4464a 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/manage_profile_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/string_number_conversions.h" @@ -13,6 +16,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/gaia_info_update_service.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.h b/chrome/browser/ui/webui/options/manage_profile_handler.h index 5c10187..49d99a8 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.h +++ b/chrome/browser/ui/webui/options/manage_profile_handler.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc index 3d37cc6..f574933 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc @@ -4,7 +4,10 @@ #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" +#include <stddef.h> + #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.h b/chrome/browser/ui/webui/options/media_devices_selection_handler.h index 4983e6c..d947836 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.h +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_DEVICES_SELECTION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_DEVICES_SELECTION_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc index 2ce5747..e1a589e 100644 --- a/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/multilanguage_options_browsertest.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/options/options_browsertest.h b/chrome/browser/ui/webui/options/options_browsertest.h index 9dd0aec..d8135a8 100644 --- a/chrome/browser/ui/webui/options/options_browsertest.h +++ b/chrome/browser/ui/webui/options/options_browsertest.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_BROWSERTEST_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/test/base/web_ui_browser_test.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 1ec0ded..33a376c 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -7,9 +7,9 @@ #include <algorithm> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop.h" @@ -18,6 +18,7 @@ #include "base/threading/thread.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_about_handler.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index b14a89d..40d84f6 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h @@ -5,12 +5,16 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_UI_H_ +#include <stddef.h> + #include <string> #include <vector> #include "base/callback_list.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc index 71db625..b42883e 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc @@ -8,6 +8,7 @@ #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/signin/account_tracker_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" @@ -32,7 +33,6 @@ #if !defined(OS_CHROMEOS) #include <string> -#include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.h b/chrome/browser/ui/webui/options/options_ui_browsertest.h index eafcfb1..aa75e2b 100644 --- a/chrome/browser/ui/webui/options/options_ui_browsertest.h +++ b/chrome/browser/ui/webui/options/options_ui_browsertest.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/test/base/in_process_browser_test.h" namespace content { diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index dc51759..645eacf 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -6,11 +6,13 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_factory.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h index 5befa1b..fc09064 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.h +++ b/chrome/browser/ui/webui/options/password_manager_handler.h @@ -5,10 +5,14 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_ +#include <stddef.h> + #include <string> #include <vector> +#include "base/macros.h" #include "base/prefs/pref_member.h" +#include "build/build_config.h" #include "chrome/browser/ui/passwords/password_manager_presenter.h" #include "chrome/browser/ui/passwords/password_ui_view.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc index 4bfcd21..dd1317c 100644 --- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc +++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc @@ -4,7 +4,9 @@ #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" using options::MediaException; diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 2f2cee9..4d57e9c 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/options/preferences_browsertest.h" +#include <stddef.h> + #include <iostream> #include <sstream> @@ -13,6 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index eeb13b5..8a00055 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc index b3ef573..ff78249 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc @@ -6,10 +6,12 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/google/google_brand.h" #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h index 5c1bf2d..3c19074 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.h +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.h b/chrome/browser/ui/webui/options/search_engine_manager_handler.h index 5fdc1f6..9ea83ff 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.h +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SEARCH_ENGINE_MANAGER_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 6f9946c..c7718f0 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/startup_pages_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index 67810a2..7c1b82f 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_ +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc index 9c889a9..9c44f68 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc @@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h index 7a281dc..980728c 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_CREATE_CONFIRM_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_CREATE_CONFIRM_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc index 548d441..1721606 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc @@ -4,9 +4,12 @@ #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" +#include <stddef.h> + #include <set> #include "base/bind.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.h b/chrome/browser/ui/webui/options/supervised_user_import_handler.h index 46e93a2..0a5ff83 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "base/strings/string16.h" diff --git a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc index 19e2fc9..f7707e8 100644 --- a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h index a8e2662..4d17286 100644 --- a/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h +++ b/chrome/browser/ui/webui/options/supervised_user_learn_more_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_LEARN_MORE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_LEARN_MORE_HANDLER_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index 67ecc43..6c7dac3 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/options/sync_setup_handler.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -12,10 +11,12 @@ #include "base/i18n/time_formatting.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.h b/chrome/browser/ui/webui/options/sync_setup_handler.h index 86ac6bc..7779510 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.h +++ b/chrome/browser/ui/webui/options/sync_setup_handler.h @@ -6,8 +6,10 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/sync/sync_startup_tracker.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc index 91433b68..7b92e33 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc @@ -9,10 +9,12 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" #include "chrome/browser/signin/signin_error_controller_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h index 459a4b0..7bf268d 100644 --- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h +++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PASSWORD_MANAGER_INTERNALS_PASSWORD_MANAGER_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PASSWORD_MANAGER_INTERNALS_PASSWORD_MANAGER_INTERNALS_UI_H_ +#include "base/macros.h" #include "components/password_manager/core/browser/log_receiver.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 46b10da..678c0e6 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/plugins_ui.h" +#include <stddef.h> + #include <algorithm> #include <string> #include <vector> @@ -11,6 +13,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" @@ -22,6 +25,7 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/plugins/plugin_finder.h" diff --git a/chrome/browser/ui/webui/plugins_ui.h b/chrome/browser/ui/webui/plugins_ui.h index d97e5d3..0d462f5 100644 --- a/chrome/browser/ui/webui/plugins_ui.h +++ b/chrome/browser/ui/webui/plugins_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PLUGINS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc index 5614f46..5872b3f 100644 --- a/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h" +#include "build/build_config.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/policy_material_design_ui.cc b/chrome/browser/ui/webui/policy_material_design_ui.cc index e81dafd..39376ac 100644 --- a/chrome/browser/ui/webui/policy_material_design_ui.cc +++ b/chrome/browser/ui/webui/policy_material_design_ui.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/policy_material_design_ui.h" +#include <stddef.h> + +#include "base/macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/policy_ui_handler.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/policy_ui.h b/chrome/browser/ui/webui/policy_ui.h index bbad641..d8b5839 100644 --- a/chrome/browser/ui/webui/policy_ui.h +++ b/chrome/browser/ui/webui/policy_ui.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" namespace content { diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index 3830cdc..2a4af9d 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.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 <vector> #include "base/callback.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/policy_ui_handler.cc b/chrome/browser/ui/webui/policy_ui_handler.cc index d22cf51..602d511 100644 --- a/chrome/browser/ui/webui/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy_ui_handler.cc @@ -17,6 +17,7 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" diff --git a/chrome/browser/ui/webui/policy_ui_handler.h b/chrome/browser/ui/webui/policy_ui_handler.h index f2b0446..b6c4a98 100644 --- a/chrome/browser/ui/webui/policy_ui_handler.h +++ b/chrome/browser/ui/webui/policy_ui_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_POLICY_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_POLICY_UI_HANDLER_H_ +#include <stddef.h> #include <string.h> #include "base/macros.h" diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.h b/chrome/browser/ui/webui/predictors/predictors_handler.h index 4089ed9..e2baee3 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.h +++ b/chrome/browser/ui/webui/predictors/predictors_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/predictors/predictors_ui.h b/chrome/browser/ui/webui/predictors/predictors_ui.h index e8b8d25..0f37e34 100644 --- a/chrome/browser/ui/webui/predictors/predictors_ui.h +++ b/chrome/browser/ui/webui/predictors/predictors_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PREDICTORS_PREDICTORS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class PredictorsUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc index 8438446..de4cff4 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_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 <stdint.h> + #include <queue> #include <string> diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc b/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc index 85c2953..4b2d235 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/print_preview/print_preview_distiller.h" +#include <stdint.h> + #include <string> #include "base/command_line.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h index ed2a7cc..aef2cea 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_distiller.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_distiller.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/feature_list.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 252f0ef..4e43db2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h" #include <ctype.h> +#include <stddef.h> #include <map> #include <string> @@ -17,6 +18,7 @@ #include "base/i18n/number_formatting.h" #include "base/json/json_reader.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" @@ -28,6 +30,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_distiller/tab_utils.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index 7bc8bc1..5d19a46 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index f075900..1c2c19e 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -9,6 +9,7 @@ #include "base/id_map.h" #include "base/lazy_instance.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" @@ -17,6 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/print_preview_data_service.h" @@ -63,7 +65,7 @@ class PrintPreviewRequestIdMapWithLock { // Gets the value for |preview_id|. // Returns true and sets |out_value| on success. - bool Get(int32 preview_id, int* out_value) { + bool Get(int32_t preview_id, int* out_value) { base::AutoLock lock(lock_); PrintPreviewRequestIdMap::const_iterator it = map_.find(preview_id); if (it == map_.end()) @@ -73,13 +75,13 @@ class PrintPreviewRequestIdMapWithLock { } // Sets the |value| for |preview_id|. - void Set(int32 preview_id, int value) { + void Set(int32_t preview_id, int value) { base::AutoLock lock(lock_); map_[preview_id] = value; } // Erases the entry for |preview_id|. - void Erase(int32 preview_id) { + void Erase(int32_t preview_id) { base::AutoLock lock(lock_); map_.erase(preview_id); } @@ -461,7 +463,7 @@ void PrintPreviewUI::SetInitialParams( } // static -void PrintPreviewUI::GetCurrentPrintPreviewStatus(int32 preview_ui_id, +void PrintPreviewUI::GetCurrentPrintPreviewStatus(int32_t preview_ui_id, int request_id, bool* cancel) { int current_id = -1; @@ -472,7 +474,7 @@ void PrintPreviewUI::GetCurrentPrintPreviewStatus(int32 preview_ui_id, *cancel = (request_id != current_id); } -int32 PrintPreviewUI::GetIDForPrintPreviewUI() const { +int32_t PrintPreviewUI::GetIDForPrintPreviewUI() const { return id_; } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h index cf3a3bc..fbcd872 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_UI_H_ +#include <stdint.h> + #include <string> #include "base/callback_forward.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -75,12 +78,12 @@ class PrintPreviewUI : public ConstrainedWebDialogUI { // Determines whether to cancel a print preview request based on // |preview_ui_id| and |request_id|. // Can be called from any thread. - static void GetCurrentPrintPreviewStatus(int32 preview_ui_id, + static void GetCurrentPrintPreviewStatus(int32_t preview_ui_id, int request_id, bool* cancel); // Returns an id to uniquely identify this PrintPreviewUI. - int32 GetIDForPrintPreviewUI() const; + int32_t GetIDForPrintPreviewUI() const; // Notifies the Web UI of a print preview request with |request_id|. void OnPrintPreviewRequest(int request_id); @@ -180,7 +183,7 @@ class PrintPreviewUI : public ConstrainedWebDialogUI { // The unique ID for this class instance. Stored here to avoid calling // GetIDForPrintPreviewUI() everywhere. - const int32 id_; + const int32_t id_; // Weak pointer to the WebUI handler. PrintPreviewHandler* handler_; diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index b4cee6a..f2604fc 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc @@ -4,6 +4,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index 85b80f7..7adf85e 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_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 <stdint.h> + #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" @@ -198,13 +201,13 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) { // Test with invalid |preview_ui_addr|. bool cancel = false; - const int32 kInvalidId = -5; + const int32_t kInvalidId = -5; preview_ui->GetCurrentPrintPreviewStatus(kInvalidId, 0, &cancel); EXPECT_TRUE(cancel); const int kFirstRequestId = 1000; const int kSecondRequestId = 1001; - const int32 preview_ui_addr = preview_ui->GetIDForPrintPreviewUI(); + const int32_t preview_ui_addr = preview_ui->GetIDForPrintPreviewUI(); // Test with kFirstRequestId. preview_ui->OnPrintPreviewRequest(kFirstRequestId); diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 97629121..2e12de2 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc @@ -14,6 +14,7 @@ // #define USE_SOURCE_FILES_DIRECTLY #include "base/bind.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/tracked_objects.h" diff --git a/chrome/browser/ui/webui/profiler_ui.h b/chrome/browser/ui/webui/profiler_ui.h index 4a490c8..350fe7e 100644 --- a/chrome/browser/ui/webui/profiler_ui.h +++ b/chrome/browser/ui/webui/profiler_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_PROFILER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_PROFILER_UI_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/metrics/profiler/tracking_synchronizer_observer.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc index 23c164a..4012583 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc @@ -33,7 +33,7 @@ void QuotaInternalsHandler::RegisterMessages() { base::Unretained(this))); } -void QuotaInternalsHandler::ReportAvailableSpace(int64 available_space) { +void QuotaInternalsHandler::ReportAvailableSpace(int64_t available_space) { SendMessage("AvailableSpaceUpdated", base::FundamentalValue(static_cast<double>(available_space))); } diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h index 1ddfce8..b3a7eb7 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.h @@ -5,10 +5,13 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_HANDLER_H_ +#include <stdint.h> + #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/web_ui_message_handler.h" #include "storage/common/quota/quota_types.h" @@ -35,7 +38,7 @@ class QuotaInternalsHandler : public content::WebUIMessageHandler { void RegisterMessages() override; // Called by QuotaInternalsProxy to report information to WebUI page. - void ReportAvailableSpace(int64 available_space); + void ReportAvailableSpace(int64_t available_space); void ReportGlobalInfo(const GlobalStorageInfo& data); void ReportPerHostInfo(const std::vector<PerHostStorageInfo>& hosts); void ReportPerOriginInfo(const std::vector<PerOriginStorageInfo>& origins); diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc index 8dfe2e8..b7ceb92 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.cc @@ -93,7 +93,7 @@ QuotaInternalsProxy::~QuotaInternalsProxy() {} handler_->func(arg); \ } -RELAY_TO_HANDLER(ReportAvailableSpace, int64) +RELAY_TO_HANDLER(ReportAvailableSpace, int64_t) RELAY_TO_HANDLER(ReportGlobalInfo, const GlobalStorageInfo&) RELAY_TO_HANDLER(ReportPerHostInfo, const std::vector<PerHostStorageInfo>&) RELAY_TO_HANDLER(ReportPerOriginInfo, const std::vector<PerOriginStorageInfo>&) @@ -102,7 +102,7 @@ RELAY_TO_HANDLER(ReportStatistics, const Statistics&) #undef RELAY_TO_HANDLER void QuotaInternalsProxy::DidGetAvailableSpace(storage::QuotaStatusCode status, - int64 space) { + int64_t space) { // crbug.com/349708 TRACE_EVENT0("io", "QuotaInternalsProxy::DidGetAvailableSpace"); @@ -112,7 +112,7 @@ void QuotaInternalsProxy::DidGetAvailableSpace(storage::QuotaStatusCode status, void QuotaInternalsProxy::DidGetGlobalQuota(storage::StorageType type, storage::QuotaStatusCode status, - int64 quota) { + int64_t quota) { if (status == storage::kQuotaStatusOk) { GlobalStorageInfo info(type); info.set_quota(quota); @@ -121,8 +121,8 @@ void QuotaInternalsProxy::DidGetGlobalQuota(storage::StorageType type, } void QuotaInternalsProxy::DidGetGlobalUsage(storage::StorageType type, - int64 usage, - int64 unlimited_usage) { + int64_t usage, + int64_t unlimited_usage) { GlobalStorageInfo info(type); info.set_usage(usage); info.set_unlimited_usage(unlimited_usage); @@ -165,7 +165,7 @@ void QuotaInternalsProxy::DidDumpOriginInfoTable( void QuotaInternalsProxy::DidGetHostUsage(const std::string& host, storage::StorageType type, - int64 usage) { + int64_t usage) { DCHECK(type == storage::kStorageTypeTemporary || type == storage::kStorageTypePersistent || type == storage::kStorageTypeSyncable); diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h index 010b3b16..b3e3d66 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_proxy.h @@ -5,11 +5,14 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_PROXY_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_PROXY_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" @@ -48,25 +51,25 @@ class QuotaInternalsProxy virtual ~QuotaInternalsProxy(); - void ReportAvailableSpace(int64 available_space); + void ReportAvailableSpace(int64_t available_space); void ReportGlobalInfo(const GlobalStorageInfo& data); void ReportPerHostInfo(const std::vector<PerHostStorageInfo>& hosts); void ReportPerOriginInfo(const std::vector<PerOriginStorageInfo>& origins); void ReportStatistics(const Statistics& stats); // Called on IO Thread by QuotaManager as callback. - void DidGetAvailableSpace(storage::QuotaStatusCode status, int64 space); + void DidGetAvailableSpace(storage::QuotaStatusCode status, int64_t space); void DidGetGlobalQuota(storage::StorageType type, storage::QuotaStatusCode status, - int64 quota); + int64_t quota); void DidGetGlobalUsage(storage::StorageType type, - int64 usage, - int64 unlimited_usage); + int64_t usage, + int64_t unlimited_usage); void DidDumpQuotaTable(const QuotaTableEntries& entries); void DidDumpOriginInfoTable(const OriginInfoTableEntries& entries); void DidGetHostUsage(const std::string& host, storage::StorageType type, - int64 usage); + int64_t usage); // Helper. Called on IO Thread. void RequestPerOriginInfo(storage::StorageType type); diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h index 8ddca4a..eeea477 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_TYPES_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_TYPES_H_ +#include <stdint.h> + #include <map> #include <string> @@ -24,17 +26,13 @@ class GlobalStorageInfo { explicit GlobalStorageInfo(storage::StorageType type); ~GlobalStorageInfo(); - void set_usage(int64 usage) { - usage_ = usage; - } + void set_usage(int64_t usage) { usage_ = usage; } - void set_unlimited_usage(int64 unlimited_usage) { + void set_unlimited_usage(int64_t unlimited_usage) { unlimited_usage_ = unlimited_usage; } - void set_quota(int64 quota) { - quota_ = quota; - } + void set_quota(int64_t quota) { quota_ = quota; } // Create new Value for passing to WebUI page. Caller is responsible for // deleting the returned pointer. @@ -42,9 +40,9 @@ class GlobalStorageInfo { private: storage::StorageType type_; - int64 usage_; - int64 unlimited_usage_; - int64 quota_; + int64_t usage_; + int64_t unlimited_usage_; + int64_t quota_; }; // Represents per host usage and quota information for the storage. @@ -53,13 +51,9 @@ class PerHostStorageInfo { PerHostStorageInfo(const std::string& host, storage::StorageType type); ~PerHostStorageInfo(); - void set_usage(int64 usage) { - usage_ = usage; - } + void set_usage(int64_t usage) { usage_ = usage; } - void set_quota(int64 quota) { - quota_ = quota; - } + void set_quota(int64_t quota) { quota_ = quota; } // Create new Value for passing to WebUI page. Caller is responsible for // deleting the returned pointer. @@ -68,8 +62,8 @@ class PerHostStorageInfo { std::string host_; storage::StorageType type_; - int64 usage_; - int64 quota_; + int64_t usage_; + int64_t quota_; }; // Represendts per origin usage and access time information. diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h index e4d9cc7..9dc78b0 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.h @@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_QUOTA_INTERNALS_QUOTA_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class QuotaInternalsUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index 7bc7540..0512b99 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.h b/chrome/browser/ui/webui/set_as_default_browser_ui.h index 2223675..9b9009d 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.h +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SET_AS_DEFAULT_BROWSER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SET_AS_DEFAULT_BROWSER_UI_H_ +#include "base/macros.h" #include "ui/web_dialogs/web_dialog_ui.h" class Browser; diff --git a/chrome/browser/ui/webui/settings/downloads_handler.h b/chrome/browser/ui/webui/settings/downloads_handler.h index d4b0aff..7da67fe 100644 --- a/chrome/browser/ui/webui/settings/downloads_handler.h +++ b/chrome/browser/ui/webui/settings/downloads_handler.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index 5fb93cc..4aee410 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/settings/font_handler.h" +#include <stddef.h> + #include "base/bind_helpers.h" #include "base/i18n/rtl.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc index 69dd582..80dd727 100644 --- a/chrome/browser/ui/webui/settings/languages_handler.cc +++ b/chrome/browser/ui/webui/settings/languages_handler.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc index 10e0888..a9d43ef 100644 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h" diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc index 1fd56bf..b1de9fa 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/settings/md_settings_ui.h" +#include <stddef.h> + #include <string> #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.h b/chrome/browser/ui/webui/settings/md_settings_ui.h index 5623dc3..55cede3 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.h +++ b/chrome/browser/ui/webui/settings/md_settings_ui.h @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc index 75be9f4..c425b38 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/settings/people_handler.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -15,6 +14,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h index 4a05c08..ac1ec58 100644 --- a/chrome/browser/ui/webui/settings/people_handler.h +++ b/chrome/browser/ui/webui/settings/people_handler.h @@ -12,6 +12,7 @@ #include "base/scoped_observer.h" #include "base/strings/utf_string_conversions.h" #include "base/timer/timer.h" +#include "build/build_config.h" #include "chrome/browser/sync/sync_startup_tracker.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "components/signin/core/browser/signin_manager_base.h" diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc index 7a8d1ee..930005d 100644 --- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc @@ -9,10 +9,12 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" #include "chrome/browser/signin/signin_error_controller_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index b3eda6e..38c7fef 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc @@ -11,6 +11,7 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/google/google_brand.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.h b/chrome/browser/ui/webui/settings/reset_settings_handler.h index 6c8215a..a6e39e1 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.h +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.h @@ -11,6 +11,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "build/build_config.h" #include "chrome/browser/ui/webui/settings/md_settings_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc index ea3ee74..b87e8cf 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler_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/values.h" #include "chrome/browser/profile_resetter/profile_resetter.h" #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index ea5795e..559be10 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.h b/chrome/browser/ui/webui/signin/inline_login_handler.h index 440ee55..e16f4b9 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_HANDLER_H_ +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 60ebf5d..0a9c4b1 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc @@ -4,11 +4,14 @@ #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" +#include <stddef.h> + #include <string> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" +#include "base/macros.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics_action.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h index f20256b..3d0adfe 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.h +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.h @@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc index 0894088..06806cb 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc @@ -8,6 +8,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_split.h" +#include "build/build_config.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.h b/chrome/browser/ui/webui/signin/inline_login_ui.h index 20a9f23..e4417fe 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.h +++ b/chrome/browser/ui/webui/signin/inline_login_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INLINE_LOGIN_UI_H_ +#include "base/macros.h" #include "chrome/browser/extensions/signin/scoped_gaia_auth_extension.h" #include "ui/web_dialogs/web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc index ed7bbed..03b1cce 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc @@ -3,9 +3,11 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc index 0fcc5d3..d6a2c6e 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service.h b/chrome/browser/ui/webui/signin/login_ui_service.h index d15efe7..23a9d11 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.h +++ b/chrome/browser/ui/webui/signin/login_ui_service.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/observer_list.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.h b/chrome/browser/ui/webui/signin/login_ui_service_factory.h index 434dbba..d940d34 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.h +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_FACTORY_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_LOGIN_UI_SERVICE_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc index 3568802..2a2585c 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" class TestLoginUI : public LoginUIService::LoginUI { diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc index 5ad9d87..23ebfb2 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h" -#include "base/basictypes.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h index cada63e..8c54080 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h index ebc6754..ef4406e 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_UI_H_ +#include "base/macros.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" // A WebUI tab-modal dialog to confirm signin with a managed account. diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 66c7d21..441afca 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc @@ -4,8 +4,11 @@ #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" +#include <stddef.h> + #include "base/bind.h" #include "base/location.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h index b26d916..570baff 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" diff --git a/chrome/browser/ui/webui/signin/user_manager_ui.h b/chrome/browser/ui/webui/signin/user_manager_ui.h index ad00e33..a025871 100644 --- a/chrome/browser/ui/webui/signin/user_manager_ui.h +++ b/chrome/browser/ui/webui/signin/user_manager_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class UserManagerScreenHandler; diff --git a/chrome/browser/ui/webui/signin_internals_ui.h b/chrome/browser/ui/webui/signin_internals_ui.h index 21781bb..217a722 100644 --- a/chrome/browser/ui/webui/signin_internals_ui.h +++ b/chrome/browser/ui/webui/signin_internals_ui.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_INTERNALS_UI_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/values.h" #include "components/signin/core/browser/about_signin_internals.h" #include "content/public/browser/web_ui_controller.h" diff --git a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc index 3147aca..adc3c67 100644 --- a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc +++ b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/supervised_user_internals_message_handler.h" #include "base/bind.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h index 56ceb1b..d590913 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_DUMP_DATABASE_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_message_handler.h" class Profile; diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h index 69225fc..26fef71 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_EXTENSION_STATUSES_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h index 4b57670..6849624 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_FILE_METADATA_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc index bfe466a..126301d 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h" +#include <stdint.h> + #include <vector> #include "base/bind.h" @@ -96,7 +98,7 @@ void SyncFileSystemInternalsHandler::OnFileSynced( void SyncFileSystemInternalsHandler::OnLogRecorded( const sync_file_system::TaskLogger::TaskLog& task_log) { base::DictionaryValue dict; - int64 duration = (task_log.end_time - task_log.start_time).InMilliseconds(); + int64_t duration = (task_log.end_time - task_log.start_time).InMilliseconds(); dict.SetInteger("duration", duration); dict.SetString("task_description", task_log.task_description); dict.SetString("result_description", task_log.result_description); diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h index 22b0cdb..bbfe610 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/sync_file_system/sync_event_observer.h" #include "chrome/browser/sync_file_system/task_logger.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h index 3b96d1c1..f8d8b45 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_SYNC_FILE_SYSTEM_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYNC_FILE_SYSTEM_INTERNALS_SYNC_FILE_SYSTEM_INTERNALS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class SyncFileSystemInternalsUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.h b/chrome/browser/ui/webui/sync_internals_message_handler.h index 4d93bbd..8020316 100644 --- a/chrome/browser/ui/webui/sync_internals_message_handler.h +++ b/chrome/browser/ui/webui/sync_internals_message_handler.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" diff --git a/chrome/browser/ui/webui/sync_internals_ui.h b/chrome/browser/ui/webui/sync_internals_ui.h index 2268ffb..e1a773d 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.h +++ b/chrome/browser/ui/webui/sync_internals_ui.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYNC_INTERNALS_UI_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://sync-internals page. diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index cb840cb..3253a65 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/macros.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/webui/system_info_ui.h b/chrome/browser/ui/webui/system_info_ui.h index 6380329..5671021 100644 --- a/chrome/browser/ui/webui/system_info_ui.h +++ b/chrome/browser/ui/webui/system_info_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SYSTEM_INFO_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" class SystemInfoUI : public content::WebUIController { diff --git a/chrome/browser/ui/webui/theme_handler.h b/chrome/browser/ui/webui/theme_handler.h index 692f394..a0c5562 100644 --- a/chrome/browser/ui/webui/theme_handler.h +++ b/chrome/browser/ui/webui/theme_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_THEME_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_THEME_HANDLER_H_ +#include "base/macros.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index d6d0d1f..6c0b4fc 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 0c8682e..60ce508 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_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 "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_loop.h" diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h index deb38cd..12a25c8 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.h @@ -8,6 +8,7 @@ #include <string> #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/translate/core/browser/translate_language_list.h" #include "components/translate/core/browser/translate_manager.h" diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h index 22936e3..e2e134a 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.h @@ -4,6 +4,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_TRANSLATE_INTERNALS_UI_H_ + +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The implementation for the chrome://translate-internals page. diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index 80fed92..0164799 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/uber/uber_ui.h" #include "base/stl_util.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/browser/ui/webui/extensions/extensions_ui.h" diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui.h b/chrome/browser/ui/webui/user_actions/user_actions_ui.h index 97c8cf9..cc25fef 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui.h +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_H_ #define CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The UI for chrome://user-actions/ diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h index 284d0d2..9423ff2 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_USER_ACTIONS_USER_ACTIONS_UI_HANDLER_H_ +#include "base/macros.h" #include "base/metrics/user_metrics.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc index adef9f8..d97890f 100644 --- a/chrome/browser/ui/webui/version_handler.cc +++ b/chrome/browser/ui/webui/version_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/version_handler.h" +#include <stddef.h> + #include "base/command_line.h" #include "base/files/file_util.h" #include "base/metrics/field_trial.h" diff --git a/chrome/browser/ui/webui/version_handler.h b/chrome/browser/ui/webui/version_handler.h index b7f272a..d121739 100644 --- a/chrome/browser/ui/webui/version_handler.h +++ b/chrome/browser/ui/webui/version_handler.h @@ -7,6 +7,7 @@ #include <vector> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/version_handler_chromeos.h b/chrome/browser/ui/webui/version_handler_chromeos.h index f8977a5..b12b7a8 100644 --- a/chrome/browser/ui/webui/version_handler_chromeos.h +++ b/chrome/browser/ui/webui/version_handler_chromeos.h @@ -7,6 +7,7 @@ #include <string> +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/version_handler.h" #include "chromeos/system/version_loader.h" diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc index 4fc5a9c..f9c70a1 100644 --- a/chrome/browser/ui/webui/version_ui.cc +++ b/chrome/browser/ui/webui/version_ui.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/version_handler.h" #include "chrome/common/channel_info.h" diff --git a/chrome/browser/ui/webui/version_ui.h b/chrome/browser/ui/webui/version_ui.h index 32e0de5..9de2301 100644 --- a/chrome/browser/ui/webui/version_ui.h +++ b/chrome/browser/ui/webui/version_ui.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_VERSION_UI_H_ #define CHROME_BROWSER_UI_WEBUI_VERSION_UI_H_ +#include "base/macros.h" #include "content/public/browser/web_ui_controller.h" // The WebUI handler for chrome://version. diff --git a/chrome/browser/ui/webui/voice_search_ui.cc b/chrome/browser/ui/webui/voice_search_ui.cc index 90ea550..08c27ca 100644 --- a/chrome/browser/ui/webui/voice_search_ui.cc +++ b/chrome/browser/ui/webui/voice_search_ui.cc @@ -8,12 +8,14 @@ #include "base/command_line.h" #include "base/files/file_enumerator.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/plugins/plugin_prefs.h" diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 0cd677a..e63f6d04 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/webui/web_ui_test_handler.h b/chrome/browser/ui/webui/web_ui_test_handler.h index 11f3a3b..cb95c2f 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.h +++ b/chrome/browser/ui/webui/web_ui_test_handler.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc index 7329d0f4..da0bf0d 100644 --- a/chrome/browser/ui/webui/webui_webview_browsertest.cc +++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc @@ -4,6 +4,7 @@ #include "base/macros.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" #include "chrome/browser/signin/signin_promo.h" |