Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 580093003: Factor Google Now welcome notifications out of DesktopNotificationService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/media/media_stream_devices_controller.h" 36 #include "chrome/browser/media/media_stream_devices_controller.h"
37 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 37 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
38 #include "chrome/browser/metrics/variations/variations_service.h" 38 #include "chrome/browser/metrics/variations/variations_service.h"
39 #include "chrome/browser/net/http_server_properties_manager_factory.h" 39 #include "chrome/browser/net/http_server_properties_manager_factory.h"
40 #include "chrome/browser/net/net_pref_observer.h" 40 #include "chrome/browser/net/net_pref_observer.h"
41 #include "chrome/browser/net/prediction_options.h" 41 #include "chrome/browser/net/prediction_options.h"
42 #include "chrome/browser/net/predictor.h" 42 #include "chrome/browser/net/predictor.h"
43 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 43 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
44 #include "chrome/browser/net/ssl_config_service_manager.h" 44 #include "chrome/browser/net/ssl_config_service_manager.h"
45 #include "chrome/browser/notifications/desktop_notification_service.h" 45 #include "chrome/browser/notifications/desktop_notification_service.h"
46 #include "chrome/browser/notifications/extension_welcome_notification.h"
46 #include "chrome/browser/notifications/message_center_notification_manager.h" 47 #include "chrome/browser/notifications/message_center_notification_manager.h"
47 #include "chrome/browser/pepper_flash_settings_manager.h" 48 #include "chrome/browser/pepper_flash_settings_manager.h"
48 #include "chrome/browser/plugins/plugin_finder.h" 49 #include "chrome/browser/plugins/plugin_finder.h"
49 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 50 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
50 #include "chrome/browser/prefs/incognito_mode_prefs.h" 51 #include "chrome/browser/prefs/incognito_mode_prefs.h"
51 #include "chrome/browser/prefs/pref_service_syncable.h" 52 #include "chrome/browser/prefs/pref_service_syncable.h"
52 #include "chrome/browser/prefs/session_startup_pref.h" 53 #include "chrome/browser/prefs/session_startup_pref.h"
53 #include "chrome/browser/printing/print_dialog_cloud.h" 54 #include "chrome/browser/printing/print_dialog_cloud.h"
54 #include "chrome/browser/profiles/chrome_version_service.h" 55 #include "chrome/browser/profiles/chrome_version_service.h"
55 #include "chrome/browser/profiles/profile.h" 56 #include "chrome/browser/profiles/profile.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 #if defined(ENABLE_MANAGED_USERS) 422 #if defined(ENABLE_MANAGED_USERS)
422 SupervisedUserService::RegisterProfilePrefs(registry); 423 SupervisedUserService::RegisterProfilePrefs(registry);
423 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 424 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
424 SupervisedUserSyncService::RegisterProfilePrefs(registry); 425 SupervisedUserSyncService::RegisterProfilePrefs(registry);
425 #endif 426 #endif
426 427
427 #if defined(ENABLE_NOTIFICATIONS) 428 #if defined(ENABLE_NOTIFICATIONS)
428 DesktopNotificationService::RegisterProfilePrefs(registry); 429 DesktopNotificationService::RegisterProfilePrefs(registry);
429 #endif 430 #endif
430 431
432 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \
433 !defined(OS_ANDROID)
434 // The extension welcome notification requires a build that enables extensions
435 // and notifications, and uses the UI message center.
436 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
437 #endif
438
431 #if defined(ENABLE_SERVICE_DISCOVERY) 439 #if defined(ENABLE_SERVICE_DISCOVERY)
432 LocalDiscoveryUI::RegisterProfilePrefs(registry); 440 LocalDiscoveryUI::RegisterProfilePrefs(registry);
433 #endif 441 #endif
434 442
435 #if defined(OS_ANDROID) 443 #if defined(OS_ANDROID)
436 chrome_variations::VariationsService::RegisterProfilePrefs(registry); 444 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
437 NewTabPagePrefs::RegisterProfilePrefs(registry); 445 NewTabPagePrefs::RegisterProfilePrefs(registry);
438 PartnerBookmarksShim::RegisterProfilePrefs(registry); 446 PartnerBookmarksShim::RegisterProfilePrefs(registry);
439 #else 447 #else
440 AppShortcutManager::RegisterProfilePrefs(registry); 448 AppShortcutManager::RegisterProfilePrefs(registry);
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 #if defined(OS_CHROMEOS) 622 #if defined(OS_CHROMEOS)
615 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 623 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
616 #endif 624 #endif
617 625
618 #if defined(TOOLKIT_VIEWS) 626 #if defined(TOOLKIT_VIEWS)
619 MigrateBrowserTabStripPrefs(local_state); 627 MigrateBrowserTabStripPrefs(local_state);
620 #endif 628 #endif
621 } 629 }
622 630
623 } // namespace chrome 631 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/notifications/message_center_notification_manager.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698