Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(741)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
13 #include "build/build_config.h"
13 #include "chrome/browser/about_flags.h" 14 #include "chrome/browser/about_flags.h"
14 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 15 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
15 #include "chrome/browser/browser_process_impl.h" 16 #include "chrome/browser/browser_process_impl.h"
16 #include "chrome/browser/browser_shutdown.h" 17 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
18 #include "chrome/browser/component_updater/recovery_component_installer.h" 19 #include "chrome/browser/component_updater/recovery_component_installer.h"
19 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
21 #include "chrome/browser/devtools/devtools_window.h" 22 #include "chrome/browser/devtools/devtools_window.h"
22 #include "chrome/browser/download/download_prefs.h" 23 #include "chrome/browser/download/download_prefs.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "components/policy/core/browser/url_blacklist_manager.h" 105 #include "components/policy/core/browser/url_blacklist_manager.h"
105 #include "components/policy/core/common/policy_statistics_collector.h" 106 #include "components/policy/core/common/policy_statistics_collector.h"
106 #endif 107 #endif
107 108
108 #if defined(ENABLE_EXTENSIONS) 109 #if defined(ENABLE_EXTENSIONS)
109 #include "chrome/browser/accessibility/animation_policy_prefs.h" 110 #include "chrome/browser/accessibility/animation_policy_prefs.h"
110 #include "chrome/browser/apps/drive/drive_app_mapping.h" 111 #include "chrome/browser/apps/drive/drive_app_mapping.h"
111 #include "chrome/browser/apps/shortcut_manager.h" 112 #include "chrome/browser/apps/shortcut_manager.h"
112 #include "chrome/browser/extensions/activity_log/activity_log.h" 113 #include "chrome/browser/extensions/activity_log/activity_log.h"
113 #include "chrome/browser/extensions/api/commands/command_service.h" 114 #include "chrome/browser/extensions/api/commands/command_service.h"
115 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
114 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 116 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
115 #include "chrome/browser/extensions/extension_web_ui.h" 117 #include "chrome/browser/extensions/extension_web_ui.h"
116 #include "chrome/browser/extensions/launch_util.h" 118 #include "chrome/browser/extensions/launch_util.h"
117 #include "chrome/browser/signin/easy_unlock_service.h" 119 #include "chrome/browser/signin/easy_unlock_service.h"
120 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
118 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 121 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
119 #include "extensions/browser/extension_prefs.h" 122 #include "extensions/browser/extension_prefs.h"
120 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
121 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
122 #endif // defined(ENABLE_EXTENSIONS) 123 #endif // defined(ENABLE_EXTENSIONS)
123 124
124 #if defined(ENABLE_PLUGIN_INSTALLATION) 125 #if defined(ENABLE_PLUGIN_INSTALLATION)
125 #include "chrome/browser/plugins/plugins_resource_service.h" 126 #include "chrome/browser/plugins/plugins_resource_service.h"
126 #endif 127 #endif
127 128
128 #if defined(ENABLE_SUPERVISED_USERS) 129 #if defined(ENABLE_SUPERVISED_USERS)
129 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" 130 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
130 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 131 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
131 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 132 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 597
597 // Added 12/1015. 598 // Added 12/1015.
598 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); 599 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld);
599 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); 600 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime);
600 601
601 // Added 12/2015. 602 // Added 12/2015.
602 profile_prefs->ClearPref(kRestoreOnStartupMigrated); 603 profile_prefs->ClearPref(kRestoreOnStartupMigrated);
603 } 604 }
604 605
605 } // namespace chrome 606 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.h ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698