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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/profiles/profile_manager.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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/debug/alias.h" 16 #include "base/debug/alias.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/prefs/pref_service.h"
21 #include "base/stl_util.h" 20 #include "base/stl_util.h"
22 #include "base/strings/string_number_conversions.h" 21 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
24 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
25 #include "base/thread_task_runner_handle.h" 24 #include "base/thread_task_runner_handle.h"
26 #include "base/threading/sequenced_worker_pool.h" 25 #include "base/threading/sequenced_worker_pool.h"
27 #include "build/build_config.h" 26 #include "build/build_config.h"
28 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
29 #include "chrome/browser/chrome_notification_types.h" 28 #include "chrome/browser/chrome_notification_types.h"
30 #include "chrome/browser/content_settings/cookie_settings_factory.h" 29 #include "chrome/browser/content_settings/cookie_settings_factory.h"
(...skipping 24 matching lines...) Expand all
55 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
56 #include "components/about_handler/about_protocol_handler.h" 55 #include "components/about_handler/about_protocol_handler.h"
57 #include "components/content_settings/core/browser/content_settings_provider.h" 56 #include "components/content_settings/core/browser/content_settings_provider.h"
58 #include "components/content_settings/core/browser/cookie_settings.h" 57 #include "components/content_settings/core/browser/cookie_settings.h"
59 #include "components/content_settings/core/browser/host_content_settings_map.h" 58 #include "components/content_settings/core/browser/host_content_settings_map.h"
60 #include "components/cookie_config/cookie_store_util.h" 59 #include "components/cookie_config/cookie_store_util.h"
61 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 60 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
62 #include "components/dom_distiller/core/url_constants.h" 61 #include "components/dom_distiller/core/url_constants.h"
63 #include "components/metrics/metrics_pref_names.h" 62 #include "components/metrics/metrics_pref_names.h"
64 #include "components/net_log/chrome_net_log.h" 63 #include "components/net_log/chrome_net_log.h"
64 #include "components/prefs/pref_service.h"
65 #include "components/signin/core/common/signin_pref_names.h" 65 #include "components/signin/core/common/signin_pref_names.h"
66 #include "components/sync_driver/pref_names.h" 66 #include "components/sync_driver/pref_names.h"
67 #include "components/url_formatter/url_fixer.h" 67 #include "components/url_formatter/url_fixer.h"
68 #include "content/public/browser/browser_thread.h" 68 #include "content/public/browser/browser_thread.h"
69 #include "content/public/browser/host_zoom_map.h" 69 #include "content/public/browser/host_zoom_map.h"
70 #include "content/public/browser/notification_service.h" 70 #include "content/public/browser/notification_service.h"
71 #include "content/public/browser/resource_context.h" 71 #include "content/public/browser/resource_context.h"
72 #include "net/base/keygen_handler.h" 72 #include "net/base/keygen_handler.h"
73 #include "net/base/network_quality_estimator.h" 73 #include "net/base/network_quality_estimator.h"
74 #include "net/cert/cert_verifier.h" 74 #include "net/cert/cert_verifier.h"
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory( 1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory(
1323 network_controller_handle_.GetController(), shared_session)), 1323 network_controller_handle_.GetController(), shared_session)),
1324 std::move(backend), true /* set_up_quic_server_info */)); 1324 std::move(backend), true /* set_up_quic_server_info */));
1325 } 1325 }
1326 1326
1327 void ProfileIOData::SetCookieSettingsForTesting( 1327 void ProfileIOData::SetCookieSettingsForTesting(
1328 content_settings::CookieSettings* cookie_settings) { 1328 content_settings::CookieSettings* cookie_settings) {
1329 DCHECK(!cookie_settings_.get()); 1329 DCHECK(!cookie_settings_.get());
1330 cookie_settings_ = cookie_settings; 1330 cookie_settings_ = cookie_settings;
1331 } 1331 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698