| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "chrome/browser/ui/webui/flags_ui.h" | 54 #include "chrome/browser/ui/webui/flags_ui.h" |
| 55 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 55 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
| 56 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 56 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 57 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" | 57 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" |
| 58 #include "chrome/browser/ui/webui/plugins_ui.h" | 58 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 59 #include "chrome/browser/ui/webui/sync_promo_ui.h" | 59 #include "chrome/browser/ui/webui/sync_promo_ui.h" |
| 60 #include "chrome/browser/upgrade_detector.h" | 60 #include "chrome/browser/upgrade_detector.h" |
| 61 #include "chrome/browser/web_resource/promo_resource_service.h" | 61 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 62 #include "chrome/common/pref_names.h" | 62 #include "chrome/common/pref_names.h" |
| 63 #include "content/browser/host_zoom_map.h" | 63 #include "content/browser/host_zoom_map.h" |
| 64 #include "content/browser/renderer_host/browser_render_process_host.h" | |
| 65 #include "content/browser/ssl/ssl_manager.h" | 64 #include "content/browser/ssl/ssl_manager.h" |
| 65 #include "content/public/browser/render_process_host.h" |
| 66 | 66 |
| 67 #if defined(OS_MACOSX) | 67 #if defined(OS_MACOSX) |
| 68 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" | 68 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 71 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 72 #include "chrome/browser/ui/views/browser_actions_container.h" | 72 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 73 #include "chrome/browser/ui/views/frame/browser_view.h" | 73 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 74 #endif | 74 #endif |
| 75 | 75 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 220 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
| 221 } | 221 } |
| 222 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 222 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
| 223 | 223 |
| 224 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 224 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 225 current_version | WINDOWS_PREFS); | 225 current_version | WINDOWS_PREFS); |
| 226 } | 226 } |
| 227 } | 227 } |
| 228 | 228 |
| 229 } // namespace browser | 229 } // namespace browser |
| OLD | NEW |