| OLD | NEW |
| 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 "apps/prefs.h" | 7 #include "apps/prefs.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 #if defined(OS_MACOSX) | 164 #if defined(OS_MACOSX) |
| 165 #include "chrome/browser/ui/cocoa/confirm_quit.h" | 165 #include "chrome/browser/ui/cocoa/confirm_quit.h" |
| 166 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" | 166 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" |
| 167 #endif | 167 #endif |
| 168 | 168 |
| 169 #if defined(OS_WIN) | 169 #if defined(OS_WIN) |
| 170 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" | 170 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" |
| 171 #endif | 171 #endif |
| 172 | 172 |
| 173 #if defined(OS_ANDROID) |
| 174 #include "chrome/browser/android/new_tab_page_prefs.h" |
| 175 #include "chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim.h" |
| 176 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" |
| 177 #else |
| 178 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" |
| 179 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
| 180 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
| 181 #endif |
| 182 |
| 173 #if defined(TOOLKIT_VIEWS) | 183 #if defined(TOOLKIT_VIEWS) |
| 174 #include "chrome/browser/ui/browser_view_prefs.h" | 184 #include "chrome/browser/ui/browser_view_prefs.h" |
| 175 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" | 185 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" |
| 176 #endif | 186 #endif |
| 177 | 187 |
| 178 #if defined(TOOLKIT_GTK) | 188 #if defined(TOOLKIT_GTK) |
| 179 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 189 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 180 #endif | 190 #endif |
| 181 | 191 |
| 182 #if defined(USE_ASH) | 192 #if defined(USE_ASH) |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 | 389 |
| 380 #if defined(ENABLE_MDNS) | 390 #if defined(ENABLE_MDNS) |
| 381 LocalDiscoveryUI::RegisterProfilePrefs(registry); | 391 LocalDiscoveryUI::RegisterProfilePrefs(registry); |
| 382 #endif | 392 #endif |
| 383 | 393 |
| 384 #if defined(ENABLE_NOTIFICATIONS) | 394 #if defined(ENABLE_NOTIFICATIONS) |
| 385 DesktopNotificationService::RegisterProfilePrefs(registry); | 395 DesktopNotificationService::RegisterProfilePrefs(registry); |
| 386 #endif | 396 #endif |
| 387 | 397 |
| 388 #if defined(OS_ANDROID) | 398 #if defined(OS_ANDROID) |
| 399 NewTabPagePrefs::RegisterProfilePrefs(registry); |
| 389 PartnerBookmarksShim::RegisterProfilePrefs(registry); | 400 PartnerBookmarksShim::RegisterProfilePrefs(registry); |
| 390 PromoHandler::RegisterProfilePrefs(registry); | 401 PromoHandler::RegisterProfilePrefs(registry); |
| 391 #else | 402 #else |
| 392 AppShortcutManager::RegisterProfilePrefs(registry); | 403 AppShortcutManager::RegisterProfilePrefs(registry); |
| 393 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); | 404 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); |
| 394 DeviceIDFetcher::RegisterProfilePrefs(registry); | 405 DeviceIDFetcher::RegisterProfilePrefs(registry); |
| 395 DevToolsWindow::RegisterProfilePrefs(registry); | 406 DevToolsWindow::RegisterProfilePrefs(registry); |
| 396 extensions::CommandService::RegisterProfilePrefs(registry); | 407 extensions::CommandService::RegisterProfilePrefs(registry); |
| 397 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); | 408 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); |
| 398 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); | 409 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 } | 566 } |
| 556 local_state->ClearPref(prefs::kLastPromptedGoogleURL); | 567 local_state->ClearPref(prefs::kLastPromptedGoogleURL); |
| 557 | 568 |
| 558 current_version |= GOOGLE_URL_TRACKER_PREFS; | 569 current_version |= GOOGLE_URL_TRACKER_PREFS; |
| 559 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
| 560 current_version); | 571 current_version); |
| 561 } | 572 } |
| 562 } | 573 } |
| 563 | 574 |
| 564 } // namespace chrome | 575 } // namespace chrome |
| OLD | NEW |