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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating for win p/f Created 5 years, 3 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/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/profiles/profile_impl.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/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/json_pref_store.h" 12 #include "base/prefs/json_pref_store.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/background/background_contents_service_factory.h" 16 #include "chrome/browser/background/background_contents_service_factory.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/dom_distiller/profile_utils.h" 18 #include "chrome/browser/dom_distiller/profile_utils.h"
19 #include "chrome/browser/download/chrome_download_manager_delegate.h" 19 #include "chrome/browser/download/chrome_download_manager_delegate.h"
20 #include "chrome/browser/download/download_service.h" 20 #include "chrome/browser/download/download_service.h"
21 #include "chrome/browser/download/download_service_factory.h" 21 #include "chrome/browser/download/download_service_factory.h"
22 #include "chrome/browser/io_thread.h" 22 #include "chrome/browser/io_thread.h"
23 #include "chrome/browser/net/chrome_url_request_context_getter.h" 23 #include "chrome/browser/net/chrome_url_request_context_getter.h"
24 #include "chrome/browser/net/pref_proxy_config_tracker.h"
25 #include "chrome/browser/net/proxy_service_factory.h" 24 #include "chrome/browser/net/proxy_service_factory.h"
26 #include "chrome/browser/permissions/permission_manager.h" 25 #include "chrome/browser/permissions/permission_manager.h"
27 #include "chrome/browser/permissions/permission_manager_factory.h" 26 #include "chrome/browser/permissions/permission_manager_factory.h"
28 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 27 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
29 #include "chrome/browser/plugins/plugin_prefs.h" 28 #include "chrome/browser/plugins/plugin_prefs.h"
30 #include "chrome/browser/prefs/incognito_mode_prefs.h" 29 #include "chrome/browser/prefs/incognito_mode_prefs.h"
31 #include "chrome/browser/prefs/pref_service_syncable.h" 30 #include "chrome/browser/prefs/pref_service_syncable.h"
32 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
33 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 32 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
34 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 33 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
35 #include "chrome/browser/themes/theme_service.h" 34 #include "chrome/browser/themes/theme_service.h"
36 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 35 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
37 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h" 36 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h"
38 #include "chrome/common/chrome_constants.h" 37 #include "chrome/common/chrome_constants.h"
39 #include "chrome/common/chrome_paths.h" 38 #include "chrome/common/chrome_paths.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h"
42 #include "components/content_settings/core/browser/host_content_settings_map.h" 40 #include "components/content_settings/core/browser/host_content_settings_map.h"
43 #include "components/keyed_service/content/browser_context_dependency_manager.h" 41 #include "components/keyed_service/content/browser_context_dependency_manager.h"
42 #include "components/proxy_config/pref_proxy_config_tracker.h"
44 #include "components/ui/zoom/zoom_event_manager.h" 43 #include "components/ui/zoom/zoom_event_manager.h"
45 #include "components/user_prefs/user_prefs.h" 44 #include "components/user_prefs/user_prefs.h"
46 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
47 #include "content/public/browser/host_zoom_map.h" 46 #include "content/public/browser/host_zoom_map.h"
48 #include "content/public/browser/render_process_host.h" 47 #include "content/public/browser/render_process_host.h"
49 #include "content/public/browser/storage_partition.h" 48 #include "content/public/browser/storage_partition.h"
50 #include "content/public/browser/url_data_source.h" 49 #include "content/public/browser/url_data_source.h"
51 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
52 #include "net/http/http_server_properties.h" 51 #include "net/http/http_server_properties.h"
53 #include "net/http/transport_security_state.h" 52 #include "net/http/transport_security_state.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 582 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
584 #if defined(OS_CHROMEOS) 583 #if defined(OS_CHROMEOS)
585 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 584 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
586 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 585 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
587 g_browser_process->local_state()); 586 g_browser_process->local_state());
588 } 587 }
589 #endif // defined(OS_CHROMEOS) 588 #endif // defined(OS_CHROMEOS)
590 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 589 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
591 GetPrefs(), g_browser_process->local_state()); 590 GetPrefs(), g_browser_process->local_state());
592 } 591 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698