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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 200493006: Move the ShortcutsBackend from history to autocomplete so that it can fully (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 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/profiles/profile_impl.h ('k') | chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/environment.h" 12 #include "base/environment.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/json_pref_store.h" 17 #include "base/prefs/json_pref_store.h"
18 #include "base/prefs/scoped_user_pref_update.h" 18 #include "base/prefs/scoped_user_pref_update.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
23 #include "base/synchronization/waitable_event.h" 23 #include "base/synchronization/waitable_event.h"
24 #include "base/threading/sequenced_worker_pool.h" 24 #include "base/threading/sequenced_worker_pool.h"
25 #include "base/version.h" 25 #include "base/version.h"
26 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 26 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
27 #include "chrome/browser/autocomplete/shortcuts_backend.h"
27 #include "chrome/browser/background/background_contents_service_factory.h" 28 #include "chrome/browser/background/background_contents_service_factory.h"
28 #include "chrome/browser/background/background_mode_manager.h" 29 #include "chrome/browser/background/background_mode_manager.h"
29 #include "chrome/browser/bookmarks/bookmark_model.h" 30 #include "chrome/browser/bookmarks/bookmark_model.h"
30 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 31 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
31 #include "chrome/browser/browser_process.h" 32 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/chrome_notification_types.h" 33 #include "chrome/browser/chrome_notification_types.h"
33 #include "chrome/browser/content_settings/cookie_settings.h" 34 #include "chrome/browser/content_settings/cookie_settings.h"
34 #include "chrome/browser/content_settings/host_content_settings_map.h" 35 #include "chrome/browser/content_settings/host_content_settings_map.h"
35 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 36 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
36 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h" 37 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h"
37 #include "chrome/browser/download/chrome_download_manager_delegate.h" 38 #include "chrome/browser/download/chrome_download_manager_delegate.h"
38 #include "chrome/browser/download/download_service.h" 39 #include "chrome/browser/download/download_service.h"
39 #include "chrome/browser/download/download_service_factory.h" 40 #include "chrome/browser/download/download_service_factory.h"
40 #include "chrome/browser/extensions/extension_service.h" 41 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/extensions/extension_special_storage_policy.h" 42 #include "chrome/browser/extensions/extension_special_storage_policy.h"
42 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" 43 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
43 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto ry.h" 44 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto ry.h"
44 #include "chrome/browser/history/shortcuts_backend.h"
45 #include "chrome/browser/history/top_sites.h" 45 #include "chrome/browser/history/top_sites.h"
46 #include "chrome/browser/media/chrome_midi_permission_context.h" 46 #include "chrome/browser/media/chrome_midi_permission_context.h"
47 #include "chrome/browser/media/chrome_midi_permission_context_factory.h" 47 #include "chrome/browser/media/chrome_midi_permission_context_factory.h"
48 #include "chrome/browser/metrics/metrics_service.h" 48 #include "chrome/browser/metrics/metrics_service.h"
49 #include "chrome/browser/net/chrome_url_request_context.h" 49 #include "chrome/browser/net/chrome_url_request_context.h"
50 #include "chrome/browser/net/net_pref_observer.h" 50 #include "chrome/browser/net/net_pref_observer.h"
51 #include "chrome/browser/net/predictor.h" 51 #include "chrome/browser/net/predictor.h"
52 #include "chrome/browser/net/pref_proxy_config_tracker.h" 52 #include "chrome/browser/net/pref_proxy_config_tracker.h"
53 #include "chrome/browser/net/proxy_service_factory.h" 53 #include "chrome/browser/net/proxy_service_factory.h"
54 #include "chrome/browser/net/ssl_config_service_manager.h" 54 #include "chrome/browser/net/ssl_config_service_manager.h"
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1297 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1298 #if defined(OS_CHROMEOS) 1298 #if defined(OS_CHROMEOS)
1299 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1299 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1300 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1300 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1301 g_browser_process->local_state()); 1301 g_browser_process->local_state());
1302 } 1302 }
1303 #endif // defined(OS_CHROMEOS) 1303 #endif // defined(OS_CHROMEOS)
1304 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1304 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1305 GetPrefs(), g_browser_process->local_state()); 1305 GetPrefs(), g_browser_process->local_state());
1306 } 1306 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698