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

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

Issue 1334363002: [Eraser] First pass at removing the notification center panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: peter comments Created 5 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/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 30 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
31 #include "chrome/browser/media/media_device_id_salt.h" 31 #include "chrome/browser/media/media_device_id_salt.h"
32 #include "chrome/browser/media/media_stream_devices_controller.h" 32 #include "chrome/browser/media/media_stream_devices_controller.h"
33 #include "chrome/browser/metrics/chrome_metrics_service_client.h" 33 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
34 #include "chrome/browser/net/http_server_properties_manager_factory.h" 34 #include "chrome/browser/net/http_server_properties_manager_factory.h"
35 #include "chrome/browser/net/net_pref_observer.h" 35 #include "chrome/browser/net/net_pref_observer.h"
36 #include "chrome/browser/net/prediction_options.h" 36 #include "chrome/browser/net/prediction_options.h"
37 #include "chrome/browser/net/predictor.h" 37 #include "chrome/browser/net/predictor.h"
38 #include "chrome/browser/net/ssl_config_service_manager.h" 38 #include "chrome/browser/net/ssl_config_service_manager.h"
39 #include "chrome/browser/notifications/extension_welcome_notification.h" 39 #include "chrome/browser/notifications/extension_welcome_notification.h"
40 #include "chrome/browser/notifications/message_center_notification_manager.h"
41 #include "chrome/browser/notifications/notifier_state_tracker.h" 40 #include "chrome/browser/notifications/notifier_state_tracker.h"
42 #include "chrome/browser/pepper_flash_settings_manager.h" 41 #include "chrome/browser/pepper_flash_settings_manager.h"
43 #include "chrome/browser/plugins/plugin_finder.h" 42 #include "chrome/browser/plugins/plugin_finder.h"
44 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 43 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" 44 #include "chrome/browser/prefs/incognito_mode_prefs.h"
46 #include "chrome/browser/prefs/pref_service_syncable.h" 45 #include "chrome/browser/prefs/pref_service_syncable.h"
47 #include "chrome/browser/prefs/session_startup_pref.h" 46 #include "chrome/browser/prefs/session_startup_pref.h"
48 #include "chrome/browser/profiles/chrome_version_service.h" 47 #include "chrome/browser/profiles/chrome_version_service.h"
49 #include "chrome/browser/profiles/profile.h" 48 #include "chrome/browser/profiles/profile.h"
50 #include "chrome/browser/profiles/profile_impl.h" 49 #include "chrome/browser/profiles/profile_impl.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 271
273 #if defined(ENABLE_CONFIGURATION_POLICY) 272 #if defined(ENABLE_CONFIGURATION_POLICY)
274 policy::BrowserPolicyConnector::RegisterPrefs(registry); 273 policy::BrowserPolicyConnector::RegisterPrefs(registry);
275 policy::PolicyStatisticsCollector::RegisterPrefs(registry); 274 policy::PolicyStatisticsCollector::RegisterPrefs(registry);
276 #endif 275 #endif
277 276
278 #if defined(ENABLE_EXTENSIONS) 277 #if defined(ENABLE_EXTENSIONS)
279 EasyUnlockService::RegisterPrefs(registry); 278 EasyUnlockService::RegisterPrefs(registry);
280 #endif 279 #endif
281 280
282 #if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID)
283 // Android does not use the message center for notifications.
284 MessageCenterNotificationManager::RegisterPrefs(registry);
285 #endif
286
287 #if defined(ENABLE_PLUGINS) 281 #if defined(ENABLE_PLUGINS)
288 PluginFinder::RegisterPrefs(registry); 282 PluginFinder::RegisterPrefs(registry);
289 #endif 283 #endif
290 284
291 #if defined(ENABLE_PLUGIN_INSTALLATION) 285 #if defined(ENABLE_PLUGIN_INSTALLATION)
292 PluginsResourceService::RegisterPrefs(registry); 286 PluginsResourceService::RegisterPrefs(registry);
293 #endif 287 #endif
294 288
295 #if defined(ENABLE_TASK_MANAGER) 289 #if defined(ENABLE_TASK_MANAGER)
296 TaskManager::RegisterPrefs(registry); 290 TaskManager::RegisterPrefs(registry);
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs, 560 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs,
567 prefs::kAcceptLanguages); 561 prefs::kAcceptLanguages);
568 562
569 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 563 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
570 // Added 02/2015. 564 // Added 02/2015.
571 MigrateGoogleNowPrefs(profile); 565 MigrateGoogleNowPrefs(profile);
572 #endif 566 #endif
573 } 567 }
574 568
575 } // namespace chrome 569 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698