chrome/browser/profiles/profile_impl.cc - Issue 64843004: Get rid of user-level styles.

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

Issue 64843004: Get rid of user-level styles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge to ToT Created 7 years, 1 month 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/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | no next file with comments »

OLD	NEW
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"

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"	65 #include "chrome/browser/profiles/bookmark_model_loaded_observer.h"

66 #include "chrome/browser/profiles/chrome_version_service.h"	66 #include "chrome/browser/profiles/chrome_version_service.h"

67 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"	67 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"

68 #include "chrome/browser/profiles/profile_destroyer.h"	68 #include "chrome/browser/profiles/profile_destroyer.h"

69 #include "chrome/browser/profiles/profile_info_cache.h"	69 #include "chrome/browser/profiles/profile_info_cache.h"

70 #include "chrome/browser/profiles/profile_manager.h"	70 #include "chrome/browser/profiles/profile_manager.h"

71 #include "chrome/browser/search_engines/template_url_fetcher.h"	71 #include "chrome/browser/search_engines/template_url_fetcher.h"

72 #include "chrome/browser/sessions/session_service_factory.h"	72 #include "chrome/browser/sessions/session_service_factory.h"

73 #include "chrome/browser/ui/startup/startup_browser_creator.h"	73 #include "chrome/browser/ui/startup/startup_browser_creator.h"

74 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"	74 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

75 #include "chrome/browser/user_style_sheet_watcher.h"

76 #include "chrome/browser/webdata/web_data_service.h"	75 #include "chrome/browser/webdata/web_data_service.h"

77 #include "chrome/common/chrome_constants.h"	76 #include "chrome/common/chrome_constants.h"

78 #include "chrome/common/chrome_paths_internal.h"	77 #include "chrome/common/chrome_paths_internal.h"

79 #include "chrome/common/chrome_switches.h"	78 #include "chrome/common/chrome_switches.h"

80 #include "chrome/common/chrome_version_info.h"	79 #include "chrome/common/chrome_version_info.h"

81 #include "chrome/common/net/url_fixer_upper.h"	80 #include "chrome/common/net/url_fixer_upper.h"

82 #include "chrome/common/pref_names.h"	81 #include "chrome/common/pref_names.h"

83 #include "chrome/common/url_constants.h"	82 #include "chrome/common/url_constants.h"

84 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"	83 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"

85 #include "components/startup_metric_utils/startup_metric_utils.h"	84 #include "components/startup_metric_utils/startup_metric_utils.h"

(...skipping 1156 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1242 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {	1241 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {

1243 #if defined(OS_CHROMEOS)	1242 #if defined(OS_CHROMEOS)

1244 if (chromeos::ProfileHelper::IsSigninProfile(this)) {	1243 if (chromeos::ProfileHelper::IsSigninProfile(this)) {

1245 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(	1244 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

1246 g_browser_process->local_state());	1245 g_browser_process->local_state());

1247 }	1246 }

1248 #endif // defined(OS_CHROMEOS)	1247 #endif // defined(OS_CHROMEOS)

1249 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(	1248 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

1250 GetPrefs(), g_browser_process->local_state());	1249 GetPrefs(), g_browser_process->local_state());

1251 }	1250 }

OLD	NEW