| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
| 8 #include "chrome/browser/about_flags.h" | 8 #include "chrome/browser/about_flags.h" |
| 9 #include "chrome/browser/autofill/autofill_manager.h" | 9 #include "chrome/browser/autofill/autofill_manager.h" |
| 10 #include "chrome/browser/background/background_mode_manager.h" | 10 #include "chrome/browser/background/background_mode_manager.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "chrome/browser/profiles/profile_impl.h" | 49 #include "chrome/browser/profiles/profile_impl.h" |
| 50 #include "chrome/browser/profiles/profile_info_cache.h" | 50 #include "chrome/browser/profiles/profile_info_cache.h" |
| 51 #include "chrome/browser/profiles/profile_manager.h" | 51 #include "chrome/browser/profiles/profile_manager.h" |
| 52 #include "chrome/browser/renderer_host/web_cache_manager.h" | 52 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 53 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 53 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 54 #include "chrome/browser/tabs/pinned_tab_codec.h" | 54 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 55 #include "chrome/browser/task_manager/task_manager.h" | 55 #include "chrome/browser/task_manager/task_manager.h" |
| 56 #include "chrome/browser/translate/translate_prefs.h" | 56 #include "chrome/browser/translate/translate_prefs.h" |
| 57 #include "chrome/browser/ui/alternate_error_tab_observer.h" | 57 #include "chrome/browser/ui/alternate_error_tab_observer.h" |
| 58 #include "chrome/browser/ui/browser.h" | 58 #include "chrome/browser/ui/browser.h" |
| 59 #include "chrome/browser/ui/browser_init.h" | |
| 60 #include "chrome/browser/ui/browser_view_prefs.h" | 59 #include "chrome/browser/ui/browser_view_prefs.h" |
| 61 #include "chrome/browser/ui/network_profile_bubble_prefs.h" | 60 #include "chrome/browser/ui/network_profile_bubble_prefs.h" |
| 62 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 63 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 63 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 65 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" | 64 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 66 #include "chrome/browser/ui/webui/flags_ui.h" | 65 #include "chrome/browser/ui/webui/flags_ui.h" |
| 67 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 66 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
| 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 67 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 69 #include "chrome/browser/ui/webui/plugins_ui.h" | 68 #include "chrome/browser/ui/webui/plugins_ui.h" |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 } | 312 } |
| 314 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 313 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 315 | 314 |
| 316 current_version |= GOOGLE_URL_TRACKER_PREFS; | 315 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 317 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 316 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 318 current_version); | 317 current_version); |
| 319 } | 318 } |
| 320 } | 319 } |
| 321 | 320 |
| 322 } // namespace browser | 321 } // namespace browser |
| OLD | NEW |