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

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

Issue 124393003: Break dependency of chrome.gyp:common on content.gyp:content_browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix header macro Created 6 years, 11 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/prefs/browser_prefs.cc ('k') | chrome/chrome_browser.gypi » ('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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "net/url_request/file_protocol_handler.h" 73 #include "net/url_request/file_protocol_handler.h"
74 #include "net/url_request/ftp_protocol_handler.h" 74 #include "net/url_request/ftp_protocol_handler.h"
75 #include "net/url_request/protocol_intercept_job_factory.h" 75 #include "net/url_request/protocol_intercept_job_factory.h"
76 #include "net/url_request/url_request.h" 76 #include "net/url_request/url_request.h"
77 #include "net/url_request/url_request_file_job.h" 77 #include "net/url_request/url_request_file_job.h"
78 #include "net/url_request/url_request_job_factory_impl.h" 78 #include "net/url_request/url_request_job_factory_impl.h"
79 79
80 #if defined(ENABLE_CONFIGURATION_POLICY) 80 #if defined(ENABLE_CONFIGURATION_POLICY)
81 #include "chrome/browser/policy/cloud/policy_header_service_factory.h" 81 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
82 #include "chrome/browser/policy/policy_helpers.h" 82 #include "chrome/browser/policy/policy_helpers.h"
83 #include "components/policy/core/browser/url_blacklist_manager.h"
83 #include "components/policy/core/common/cloud/policy_header_io_helper.h" 84 #include "components/policy/core/common/cloud/policy_header_io_helper.h"
84 #include "components/policy/core/common/cloud/policy_header_service.h" 85 #include "components/policy/core/common/cloud/policy_header_service.h"
85 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 86 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
86 #include "components/policy/core/common/url_blacklist_manager.h"
87 #endif 87 #endif
88 88
89 #if defined(ENABLE_MANAGED_USERS) 89 #if defined(ENABLE_MANAGED_USERS)
90 #include "chrome/browser/managed_mode/managed_mode_url_filter.h" 90 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
91 #include "chrome/browser/managed_mode/managed_user_service.h" 91 #include "chrome/browser/managed_mode/managed_user_service.h"
92 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 92 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
93 #endif 93 #endif
94 94
95 #if defined(OS_CHROMEOS) 95 #if defined(OS_CHROMEOS)
96 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" 96 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 void ProfileIOData::SetCookieSettingsForTesting( 1179 void ProfileIOData::SetCookieSettingsForTesting(
1180 CookieSettings* cookie_settings) { 1180 CookieSettings* cookie_settings) {
1181 DCHECK(!cookie_settings_.get()); 1181 DCHECK(!cookie_settings_.get());
1182 cookie_settings_ = cookie_settings; 1182 cookie_settings_ = cookie_settings;
1183 } 1183 }
1184 1184
1185 void ProfileIOData::set_signin_names_for_testing( 1185 void ProfileIOData::set_signin_names_for_testing(
1186 SigninNamesOnIOThread* signin_names) { 1186 SigninNamesOnIOThread* signin_names) {
1187 signin_names_.reset(signin_names); 1187 signin_names_.reset(signin_names);
1188 } 1188 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698