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

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

Issue 607603002: [Athena] Tempolarily exclude extensions API that are causing crash on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 NewTabPagePrefs::RegisterProfilePrefs(registry); 445 NewTabPagePrefs::RegisterProfilePrefs(registry);
446 PartnerBookmarksShim::RegisterProfilePrefs(registry); 446 PartnerBookmarksShim::RegisterProfilePrefs(registry);
447 #else 447 #else
448 AppShortcutManager::RegisterProfilePrefs(registry); 448 AppShortcutManager::RegisterProfilePrefs(registry);
449 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 449 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
450 DeviceIDFetcher::RegisterProfilePrefs(registry); 450 DeviceIDFetcher::RegisterProfilePrefs(registry);
451 DevToolsWindow::RegisterProfilePrefs(registry); 451 DevToolsWindow::RegisterProfilePrefs(registry);
452 DriveAppMapping::RegisterProfilePrefs(registry); 452 DriveAppMapping::RegisterProfilePrefs(registry);
453 extensions::CommandService::RegisterProfilePrefs(registry); 453 extensions::CommandService::RegisterProfilePrefs(registry);
454 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 454 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
455 #if !defined(USE_ATHENA)
455 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 456 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
457 #endif
456 first_run::RegisterProfilePrefs(registry); 458 first_run::RegisterProfilePrefs(registry);
457 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry); 459 gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
458 NewTabUI::RegisterProfilePrefs(registry); 460 NewTabUI::RegisterProfilePrefs(registry);
459 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 461 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
460 PinnedTabCodec::RegisterProfilePrefs(registry); 462 PinnedTabCodec::RegisterProfilePrefs(registry);
461 PluginsUI::RegisterProfilePrefs(registry); 463 PluginsUI::RegisterProfilePrefs(registry);
462 RegisterAutolaunchUserPrefs(registry); 464 RegisterAutolaunchUserPrefs(registry);
463 signin::RegisterProfilePrefs(registry); 465 signin::RegisterProfilePrefs(registry);
464 #endif 466 #endif
465 467
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 #if defined(OS_CHROMEOS) 625 #if defined(OS_CHROMEOS)
624 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 626 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
625 #endif 627 #endif
626 628
627 #if defined(TOOLKIT_VIEWS) 629 #if defined(TOOLKIT_VIEWS)
628 MigrateBrowserTabStripPrefs(local_state); 630 MigrateBrowserTabStripPrefs(local_state);
629 #endif 631 #endif
630 } 632 }
631 633
632 } // namespace chrome 634 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698