diff options
| author | avi <avi@chromium.org> | 2015-12-25 18:10:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 02:11:32 +0000 |
| commit | b896c715dd14ec1f7ac800350b40eeb6de2ba868 (patch) | |
| tree | acc471478046a775c3492046a40c2ea84e8ea88a /chrome/browser/prefs/browser_prefs.cc | |
| parent | f5b61be8a18b07a2a928f10bf1f8f0e8a5358f13 (diff) | |
| download | chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.zip chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.gz chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.bz2 | |
Switch to standard integer types in chrome/browser/, part 3 of 4.
BUG=138542
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1548133002
Cr-Commit-Position: refs/heads/master@{#366883}
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 5 |
1 files changed, 3 insertions, 2 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) |