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

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

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 NotifierStateTracker::RegisterProfilePrefs(registry); 433 NotifierStateTracker::RegisterProfilePrefs(registry);
434 #endif 434 #endif
435 435
436 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ 436 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \
437 !defined(OS_ANDROID) 437 !defined(OS_ANDROID)
438 // The extension welcome notification requires a build that enables extensions 438 // The extension welcome notification requires a build that enables extensions
439 // and notifications, and uses the UI message center. 439 // and notifications, and uses the UI message center.
440 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 440 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
441 #endif 441 #endif
442 442
443 #if defined(ENABLE_PLUGINS)
444 PluginsUI::RegisterProfilePrefs(registry);
445 #endif
446
443 #if defined(ENABLE_PRINT_PREVIEW) 447 #if defined(ENABLE_PRINT_PREVIEW)
444 printing::StickySettings::RegisterProfilePrefs(registry); 448 printing::StickySettings::RegisterProfilePrefs(registry);
445 #endif 449 #endif
446 450
447 #if defined(ENABLE_SERVICE_DISCOVERY) 451 #if defined(ENABLE_SERVICE_DISCOVERY)
448 LocalDiscoveryUI::RegisterProfilePrefs(registry); 452 LocalDiscoveryUI::RegisterProfilePrefs(registry);
449 #endif 453 #endif
450 454
451 #if defined(ENABLE_SUPERVISED_USERS) 455 #if defined(ENABLE_SUPERVISED_USERS)
452 #if !defined(OS_ANDROID) && !defined(OS_IOS) 456 #if !defined(OS_ANDROID) && !defined(OS_IOS)
(...skipping 15 matching lines...) Expand all
468 DevToolsWindow::RegisterProfilePrefs(registry); 472 DevToolsWindow::RegisterProfilePrefs(registry);
469 DriveAppMapping::RegisterProfilePrefs(registry); 473 DriveAppMapping::RegisterProfilePrefs(registry);
470 extensions::CommandService::RegisterProfilePrefs(registry); 474 extensions::CommandService::RegisterProfilePrefs(registry);
471 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 475 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
472 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 476 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
473 first_run::RegisterProfilePrefs(registry); 477 first_run::RegisterProfilePrefs(registry);
474 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 478 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
475 NewTabUI::RegisterProfilePrefs(registry); 479 NewTabUI::RegisterProfilePrefs(registry);
476 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 480 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
477 PinnedTabCodec::RegisterProfilePrefs(registry); 481 PinnedTabCodec::RegisterProfilePrefs(registry);
478 PluginsUI::RegisterProfilePrefs(registry);
479 RegisterAutolaunchUserPrefs(registry); 482 RegisterAutolaunchUserPrefs(registry);
480 signin::RegisterProfilePrefs(registry); 483 signin::RegisterProfilePrefs(registry);
481 #endif 484 #endif
482 485
483 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 486 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
484 default_apps::RegisterProfilePrefs(registry); 487 default_apps::RegisterProfilePrefs(registry);
485 #endif 488 #endif
486 489
487 #if defined(OS_CHROMEOS) 490 #if defined(OS_CHROMEOS)
488 chromeos::first_run::RegisterProfilePrefs(registry); 491 chromeos::first_run::RegisterProfilePrefs(registry);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); 571 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs);
569 #endif 572 #endif
570 573
571 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 574 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
572 // Added 02/2015. 575 // Added 02/2015.
573 MigrateGoogleNowPrefs(profile); 576 MigrateGoogleNowPrefs(profile);
574 #endif 577 #endif
575 } 578 }
576 579
577 } // namespace chrome 580 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698