| 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_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #include "chrome/browser/translate/translate_prefs.h" | 52 #include "chrome/browser/translate/translate_prefs.h" |
| 53 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 53 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 54 #include "chrome/browser/ui/browser.h" | 54 #include "chrome/browser/ui/browser.h" |
| 55 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 55 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 56 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 57 #include "chrome/browser/ui/webui/flags_ui.h" | 57 #include "chrome/browser/ui/webui/flags_ui.h" |
| 58 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 58 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
| 59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 59 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 60 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" | 60 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" |
| 61 #include "chrome/browser/ui/webui/plugins_ui.h" | 61 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 62 #include "chrome/browser/ui/webui/sync_promo_ui.h" | 62 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 63 #include "chrome/browser/upgrade_detector.h" | 63 #include "chrome/browser/upgrade_detector.h" |
| 64 #include "chrome/browser/web_resource/promo_resource_service.h" | 64 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 65 #include "chrome/common/pref_names.h" | 65 #include "chrome/common/pref_names.h" |
| 66 #include "content/browser/host_zoom_map.h" | 66 #include "content/browser/host_zoom_map.h" |
| 67 #include "content/browser/ssl/ssl_manager.h" | 67 #include "content/browser/ssl/ssl_manager.h" |
| 68 #include "content/public/browser/render_process_host.h" | 68 #include "content/public/browser/render_process_host.h" |
| 69 | 69 |
| 70 #if defined(OS_MACOSX) | 70 #if defined(OS_MACOSX) |
| 71 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" | 71 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" |
| 72 #endif | 72 #endif |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 226 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 227 } | 227 } |
| 228 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 228 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 229 | 229 |
| 230 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 230 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 231 current_version | WINDOWS_PREFS); | 231 current_version | WINDOWS_PREFS); |
| 232 } | 232 } |
| 233 } | 233 } |
| 234 | 234 |
| 235 } // namespace browser | 235 } // namespace browser |
| OLD | NEW |