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

Issues Search
    My Issues | Starred     Open | Closed | All

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: format 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
« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | chrome/browser/ui/app_list/drive/drive_service_bridge.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 63 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
64 #include "chrome/browser/renderer_host/web_cache_manager.h" 64 #include "chrome/browser/renderer_host/web_cache_manager.h"
65 #include "chrome/browser/search/search.h" 65 #include "chrome/browser/search/search.h"
66 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 66 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
67 #include "chrome/browser/services/gcm/gcm_profile_service.h" 67 #include "chrome/browser/services/gcm/gcm_profile_service.h"
68 #include "chrome/browser/signin/easy_unlock.h" 68 #include "chrome/browser/signin/easy_unlock.h"
69 #include "chrome/browser/signin/signin_manager_factory.h" 69 #include "chrome/browser/signin/signin_manager_factory.h"
70 #include "chrome/browser/signin/signin_promo.h" 70 #include "chrome/browser/signin/signin_promo.h"
71 #include "chrome/browser/task_manager/task_manager.h" 71 #include "chrome/browser/task_manager/task_manager.h"
72 #include "chrome/browser/ui/app_list/app_list_service.h" 72 #include "chrome/browser/ui/app_list/app_list_service.h"
73 #include "chrome/browser/ui/app_list/drive/drive_app_mapping.h"
73 #include "chrome/browser/ui/browser_ui_prefs.h" 74 #include "chrome/browser/ui/browser_ui_prefs.h"
74 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 75 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
75 #include "chrome/browser/ui/network_profile_bubble.h" 76 #include "chrome/browser/ui/network_profile_bubble.h"
76 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 77 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
77 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 78 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
78 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 79 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
79 #include "chrome/browser/ui/startup/default_browser_prompt.h" 80 #include "chrome/browser/ui/startup/default_browser_prompt.h"
80 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 81 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
81 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 82 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
82 #include "chrome/browser/ui/webui/flags_ui.h" 83 #include "chrome/browser/ui/webui/flags_ui.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 autofill::AutofillManager::RegisterProfilePrefs(registry); 335 autofill::AutofillManager::RegisterProfilePrefs(registry);
335 bookmark_utils::RegisterProfilePrefs(registry); 336 bookmark_utils::RegisterProfilePrefs(registry);
336 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 337 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
337 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 338 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
338 ChromeVersionService::RegisterProfilePrefs(registry); 339 ChromeVersionService::RegisterProfilePrefs(registry);
339 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs( 340 chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
340 registry); 341 registry);
341 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 342 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
342 chrome_prefs::RegisterProfilePrefs(registry); 343 chrome_prefs::RegisterProfilePrefs(registry);
343 DownloadPrefs::RegisterProfilePrefs(registry); 344 DownloadPrefs::RegisterProfilePrefs(registry);
345 DriveAppMapping::RegisterProfilePrefs(registry);
344 easy_unlock::RegisterProfilePrefs(registry); 346 easy_unlock::RegisterProfilePrefs(registry);
345 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 347 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
346 extensions::launch_util::RegisterProfilePrefs(registry); 348 extensions::launch_util::RegisterProfilePrefs(registry);
347 ExtensionWebUI::RegisterProfilePrefs(registry); 349 ExtensionWebUI::RegisterProfilePrefs(registry);
348 HostContentSettingsMap::RegisterProfilePrefs(registry); 350 HostContentSettingsMap::RegisterProfilePrefs(registry);
349 IncognitoModePrefs::RegisterProfilePrefs(registry); 351 IncognitoModePrefs::RegisterProfilePrefs(registry);
350 InstantUI::RegisterProfilePrefs(registry); 352 InstantUI::RegisterProfilePrefs(registry);
351 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 353 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
352 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 354 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
353 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 355 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 #if defined(OS_CHROMEOS) 577 #if defined(OS_CHROMEOS)
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
577 #endif 579 #endif
578 580
579 #if defined(TOOLKIT_VIEWS) 581 #if defined(TOOLKIT_VIEWS)
580 MigrateBrowserTabStripPrefs(local_state); 582 MigrateBrowserTabStripPrefs(local_state);
581 #endif 583 #endif
582 } 584 }
583 585
584 } // namespace chrome 586 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | chrome/browser/ui/app_list/drive/drive_service_bridge.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698