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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 (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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/ui/startup/startup_browser_creator.h" 74 #include "chrome/browser/ui/startup/startup_browser_creator.h"
75 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 75 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
76 #include "chrome/browser/webdata/web_data_service.h" 76 #include "chrome/browser/webdata/web_data_service.h"
77 #include "chrome/common/chrome_constants.h" 77 #include "chrome/common/chrome_constants.h"
78 #include "chrome/common/chrome_paths_internal.h" 78 #include "chrome/common/chrome_paths_internal.h"
79 #include "chrome/common/chrome_switches.h" 79 #include "chrome/common/chrome_switches.h"
80 #include "chrome/common/chrome_version_info.h" 80 #include "chrome/common/chrome_version_info.h"
81 #include "chrome/common/net/url_fixer_upper.h" 81 #include "chrome/common/net/url_fixer_upper.h"
82 #include "chrome/common/pref_names.h" 82 #include "chrome/common/pref_names.h"
83 #include "chrome/common/url_constants.h" 83 #include "chrome/common/url_constants.h"
84 #include "components/bookmarks/core/browser/bookmark_model.h" 84 #include "components/bookmarks/browser/bookmark_model.h"
85 #include "components/dom_distiller/content/dom_distiller_viewer_source.h" 85 #include "components/dom_distiller/content/dom_distiller_viewer_source.h"
86 #include "components/keyed_service/content/browser_context_dependency_manager.h" 86 #include "components/keyed_service/content/browser_context_dependency_manager.h"
87 #include "components/pref_registry/pref_registry_syncable.h" 87 #include "components/pref_registry/pref_registry_syncable.h"
88 #include "components/startup_metric_utils/startup_metric_utils.h" 88 #include "components/startup_metric_utils/startup_metric_utils.h"
89 #include "components/user_prefs/user_prefs.h" 89 #include "components/user_prefs/user_prefs.h"
90 #include "content/public/browser/browser_thread.h" 90 #include "content/public/browser/browser_thread.h"
91 #include "content/public/browser/dom_storage_context.h" 91 #include "content/public/browser/dom_storage_context.h"
92 #include "content/public/browser/host_zoom_map.h" 92 #include "content/public/browser/host_zoom_map.h"
93 #include "content/public/browser/notification_service.h" 93 #include "content/public/browser/notification_service.h"
94 #include "content/public/browser/render_process_host.h" 94 #include "content/public/browser/render_process_host.h"
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1357 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1358 #if defined(OS_CHROMEOS) 1358 #if defined(OS_CHROMEOS)
1359 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1359 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1360 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1361 g_browser_process->local_state()); 1361 g_browser_process->local_state());
1362 } 1362 }
1363 #endif // defined(OS_CHROMEOS) 1363 #endif // defined(OS_CHROMEOS)
1364 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1364 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1365 GetPrefs(), g_browser_process->local_state()); 1365 GetPrefs(), g_browser_process->local_state());
1366 } 1366 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/bookmark_model_loaded_observer.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698