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

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

Issue 308003005: app_list: Drive app integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix nits Created 6 years, 6 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 | Annotate | Revision Log
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 "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 11 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
12 #include "chrome/browser/apps/drive/drive_app_mapping.h"
12 #include "chrome/browser/apps/shortcut_manager.h" 13 #include "chrome/browser/apps/shortcut_manager.h"
13 #include "chrome/browser/autocomplete/zero_suggest_provider.h" 14 #include "chrome/browser/autocomplete/zero_suggest_provider.h"
14 #include "chrome/browser/background/background_mode_manager.h" 15 #include "chrome/browser/background/background_mode_manager.h"
15 #include "chrome/browser/browser_process_impl.h" 16 #include "chrome/browser/browser_process_impl.h"
16 #include "chrome/browser/browser_shutdown.h" 17 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
18 #include "chrome/browser/component_updater/recovery_component_installer.h" 19 #include "chrome/browser/component_updater/recovery_component_installer.h"
19 #include "chrome/browser/content_settings/host_content_settings_map.h" 20 #include "chrome/browser/content_settings/host_content_settings_map.h"
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
21 #include "chrome/browser/devtools/devtools_window.h" 22 #include "chrome/browser/devtools/devtools_window.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 414
414 #if defined(OS_ANDROID) 415 #if defined(OS_ANDROID)
415 chrome_variations::VariationsService::RegisterProfilePrefs(registry); 416 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
416 NewTabPagePrefs::RegisterProfilePrefs(registry); 417 NewTabPagePrefs::RegisterProfilePrefs(registry);
417 PartnerBookmarksShim::RegisterProfilePrefs(registry); 418 PartnerBookmarksShim::RegisterProfilePrefs(registry);
418 #else 419 #else
419 AppShortcutManager::RegisterProfilePrefs(registry); 420 AppShortcutManager::RegisterProfilePrefs(registry);
420 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 421 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
421 DeviceIDFetcher::RegisterProfilePrefs(registry); 422 DeviceIDFetcher::RegisterProfilePrefs(registry);
422 DevToolsWindow::RegisterProfilePrefs(registry); 423 DevToolsWindow::RegisterProfilePrefs(registry);
424 DriveAppMapping::RegisterProfilePrefs(registry);
423 extensions::CommandService::RegisterProfilePrefs(registry); 425 extensions::CommandService::RegisterProfilePrefs(registry);
424 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 426 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
425 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 427 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
426 first_run::RegisterProfilePrefs(registry); 428 first_run::RegisterProfilePrefs(registry);
427 NewTabUI::RegisterProfilePrefs(registry); 429 NewTabUI::RegisterProfilePrefs(registry);
428 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); 430 notifier::ChromeNotifierService::RegisterProfilePrefs(registry);
429 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 431 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
430 PinnedTabCodec::RegisterProfilePrefs(registry); 432 PinnedTabCodec::RegisterProfilePrefs(registry);
431 PluginsUI::RegisterProfilePrefs(registry); 433 PluginsUI::RegisterProfilePrefs(registry);
432 RegisterAutolaunchUserPrefs(registry); 434 RegisterAutolaunchUserPrefs(registry);
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 #if defined(OS_CHROMEOS) 593 #if defined(OS_CHROMEOS)
592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
593 #endif 595 #endif
594 596
595 #if defined(TOOLKIT_VIEWS) 597 #if defined(TOOLKIT_VIEWS)
596 MigrateBrowserTabStripPrefs(local_state); 598 MigrateBrowserTabStripPrefs(local_state);
597 #endif 599 #endif
598 } 600 }
599 601
600 } // namespace chrome 602 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698