diff options
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.h | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_factory.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_unittest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.h | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/incognito_mode_prefs.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/prefs/incognito_mode_prefs.h | 3 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_metrics_service.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_metrics_service.h | 1 | ||||
| -rw-r--r-- | chrome/browser/prefs/profile_pref_store_manager.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/prefs/profile_pref_store_manager.h | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/profile_pref_store_manager_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/prefs/session_startup_pref.cc | 3 |
16 files changed, 38 insertions, 4 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 6358cf6..80d4ae2 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -10,6 +10,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/invert_bubble_prefs.h" #include "chrome/browser/browser_process_impl.h" @@ -111,14 +112,14 @@ #include "chrome/browser/apps/shortcut_manager.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/api/commands/command_service.h" +#include "chrome/browser/extensions/api/copresence/copresence_api.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/signin/easy_unlock_service.h" +#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "extensions/browser/extension_prefs.h" -#include "chrome/browser/extensions/api/copresence/copresence_api.h" -#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #endif // defined(ENABLE_EXTENSIONS) #if defined(ENABLE_PLUGIN_INSTALLATION) diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h index 2d69a7d..89a5e2d 100644 --- a/chrome/browser/prefs/browser_prefs.h +++ b/chrome/browser/prefs/browser_prefs.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H_ #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H_ +#include "build/build_config.h" + class PrefRegistrySimple; class PrefService; class Profile; diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 4b313f4..b3e8f55 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/chrome_pref_service_factory.h" +#include <stddef.h> + #include <string> #include <vector> #include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/prefs/default_pref_store.h" @@ -24,6 +27,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/chrome_pref_model_associator_client.h" #include "chrome/browser/prefs/command_line_pref_store.h" diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index b54d543..1a0a1ae 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -11,6 +11,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/prefs/browser_prefs.h" #include "chrome/browser/prefs/command_line_pref_store.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 460cf2c..d452bd9 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -4,15 +4,19 @@ #include "chrome/browser/prefs/command_line_pref_store.h" +#include <stddef.h> + #include <string> #include <vector> #include "ash/ash_switches.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h" diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h index a9b9382..13468cb 100644 --- a/chrome/browser/prefs/command_line_pref_store.h +++ b/chrome/browser/prefs/command_line_pref_store.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_COMMAND_LINE_PREF_STORE_H_ #define CHROME_BROWSER_PREFS_COMMAND_LINE_PREF_STORE_H_ -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/prefs/value_map_pref_store.h" #include "base/values.h" diff --git a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc b/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc index 01aa882..f05ac53 100644 --- a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc @@ -5,8 +5,10 @@ #include "chrome/browser/prefs/command_line_pref_store.h" #include <gtest/gtest.h> +#include <stddef.h> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc index d1f5f16..060d143 100644 --- a/chrome/browser/prefs/command_line_pref_store_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. #include <gtest/gtest.h> +#include <stddef.h> #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/strings/string_util.h" #include "base/values.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc index 543451d..929263a 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.cc +++ b/chrome/browser/prefs/incognito_mode_prefs.cc @@ -4,12 +4,16 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" +#include <stdint.h> + #include "base/command_line.h" #include "base/logging.h" +#include "base/macros.h" #include "base/metrics/histogram_macros.h" #include "base/prefs/pref_service.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/features.h" diff --git a/chrome/browser/prefs/incognito_mode_prefs.h b/chrome/browser/prefs/incognito_mode_prefs.h index 3c00f7c..cbf30ef 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.h +++ b/chrome/browser/prefs/incognito_mode_prefs.h @@ -5,8 +5,9 @@ #ifndef CHROME_BROWSER_PREFS_INCOGNITO_MODE_PREFS_H_ #define CHROME_BROWSER_PREFS_INCOGNITO_MODE_PREFS_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" +#include "build/build_config.h" class PrefService; class Profile; diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc index 14745d8..dbff424 100644 --- a/chrome/browser/prefs/pref_metrics_service.cc +++ b/chrome/browser/prefs/pref_metrics_service.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/pref_metrics_service.h" +#include <stddef.h> + #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h index db7fea3..b185f43 100644 --- a/chrome/browser/prefs/pref_metrics_service.h +++ b/chrome/browser/prefs/pref_metrics_service.h @@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc index d50aa5c..9c57c4d 100644 --- a/chrome/browser/prefs/profile_pref_store_manager.cc +++ b/chrome/browser/prefs/profile_pref_store_manager.cc @@ -14,6 +14,7 @@ #include "base/prefs/persistent_pref_store.h" #include "base/prefs/pref_registry_simple.h" #include "base/sequenced_task_runner.h" +#include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/tracked/pref_hash_store_impl.h" diff --git a/chrome/browser/prefs/profile_pref_store_manager.h b/chrome/browser/prefs/profile_pref_store_manager.h index aa65a9a..a6223fe 100644 --- a/chrome/browser/prefs/profile_pref_store_manager.h +++ b/chrome/browser/prefs/profile_pref_store_manager.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ +#include <stddef.h> + #include <string> #include <vector> diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 7be6135..843c22c 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -4,12 +4,15 @@ #include "chrome/browser/prefs/profile_pref_store_manager.h" +#include <stddef.h> + #include <vector> #include "base/compiler_specific.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 51fb6c5..df053d5 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -4,11 +4,14 @@ #include "chrome/browser/prefs/session_startup_pref.h" +#include <stddef.h> + #include <string> #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" |
