| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
| 9 #include "chrome/browser/background/background_contents_service.h" | 9 #include "chrome/browser/background/background_contents_service.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 13 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 15 #include "chrome/browser/debugger/devtools_manager.h" | |
| 16 #include "chrome/browser/download/download_prefs.h" | 15 #include "chrome/browser/download/download_prefs.h" |
| 17 #include "chrome/browser/extensions/apps_promo.h" | 16 #include "chrome/browser/extensions/apps_promo.h" |
| 18 #include "chrome/browser/extensions/extension_prefs.h" | 17 #include "chrome/browser/extensions/extension_prefs.h" |
| 19 #include "chrome/browser/extensions/extension_web_ui.h" | 18 #include "chrome/browser/extensions/extension_web_ui.h" |
| 20 #include "chrome/browser/extensions/extensions_ui.h" | 19 #include "chrome/browser/extensions/extensions_ui.h" |
| 21 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 20 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
| 22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 21 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
| 23 #include "chrome/browser/geolocation/geolocation_prefs.h" | 22 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 24 #include "chrome/browser/google/google_url_tracker.h" | 23 #include "chrome/browser/google/google_url_tracker.h" |
| 25 #include "chrome/browser/instant/instant_controller.h" | 24 #include "chrome/browser/instant/instant_controller.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 50 #include "chrome/browser/translate/translate_prefs.h" | 49 #include "chrome/browser/translate/translate_prefs.h" |
| 51 #include "chrome/browser/ui/browser.h" | 50 #include "chrome/browser/ui/browser.h" |
| 52 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 51 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 52 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 54 #include "chrome/browser/ui/webui/flags_ui.h" | 53 #include "chrome/browser/ui/webui/flags_ui.h" |
| 55 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 54 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 56 #include "chrome/browser/ui/webui/plugins_ui.h" | 55 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 57 #include "chrome/browser/upgrade_detector.h" | 56 #include "chrome/browser/upgrade_detector.h" |
| 58 #include "chrome/browser/web_resource/promo_resource_service.h" | 57 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 59 #include "chrome/common/pref_names.h" | 58 #include "chrome/common/pref_names.h" |
| 59 #include "content/browser/debugger/devtools_manager.h" |
| 60 #include "content/browser/host_zoom_map.h" | 60 #include "content/browser/host_zoom_map.h" |
| 61 #include "content/browser/renderer_host/browser_render_process_host.h" | 61 #include "content/browser/renderer_host/browser_render_process_host.h" |
| 62 #include "content/browser/ssl/ssl_manager.h" | 62 #include "content/browser/ssl/ssl_manager.h" |
| 63 | 63 |
| 64 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 64 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 65 #include "chrome/browser/ui/views/browser_actions_container.h" | 65 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 66 #include "chrome/browser/ui/views/frame/browser_view.h" | 66 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 #if defined(TOOLKIT_GTK) | 69 #if defined(TOOLKIT_GTK) |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 197 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 198 } | 198 } |
| 199 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 199 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 200 | 200 |
| 201 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 201 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 202 current_version | WINDOWS_PREFS); | 202 current_version | WINDOWS_PREFS); |
| 203 } | 203 } |
| 204 } | 204 } |
| 205 | 205 |
| 206 } // namespace browser | 206 } // namespace browser |
| OLD | NEW |