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

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

Issue 1871343002: Remove PermissionContext factories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "content/public/browser/host_zoom_map.h" 52 #include "content/public/browser/host_zoom_map.h"
53 #include "content/public/browser/render_process_host.h" 53 #include "content/public/browser/render_process_host.h"
54 #include "content/public/browser/storage_partition.h" 54 #include "content/public/browser/storage_partition.h"
55 #include "content/public/browser/url_data_source.h" 55 #include "content/public/browser/url_data_source.h"
56 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
57 #include "net/http/http_server_properties.h" 57 #include "net/http/http_server_properties.h"
58 #include "net/http/transport_security_state.h" 58 #include "net/http/transport_security_state.h"
59 #include "storage/browser/database/database_tracker.h" 59 #include "storage/browser/database/database_tracker.h"
60 60
61 #if defined(OS_ANDROID) 61 #if defined(OS_ANDROID)
62 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
63 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
64 #endif // defined(OS_ANDROID)
65
66 #if defined(OS_ANDROID)
67 #include "components/prefs/scoped_user_pref_update.h" 62 #include "components/prefs/scoped_user_pref_update.h"
68 #include "components/proxy_config/proxy_prefs.h" 63 #include "components/proxy_config/proxy_prefs.h"
69 #endif // defined(OS_ANDROID) 64 #endif // defined(OS_ANDROID)
70 65
71 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
72 #include "chrome/browser/chromeos/preferences.h" 67 #include "chrome/browser/chromeos/preferences.h"
73 #include "chrome/browser/chromeos/profiles/profile_helper.h" 68 #include "chrome/browser/chromeos/profiles/profile_helper.h"
74 #endif 69 #endif
75 70
76 #if !defined(OS_CHROMEOS) 71 #if !defined(OS_CHROMEOS)
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 555 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
561 #if defined(OS_CHROMEOS) 556 #if defined(OS_CHROMEOS)
562 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 557 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
563 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 558 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
564 g_browser_process->local_state()); 559 g_browser_process->local_state());
565 } 560 }
566 #endif // defined(OS_CHROMEOS) 561 #endif // defined(OS_CHROMEOS)
567 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 562 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
568 GetPrefs(), g_browser_process->local_state()); 563 GetPrefs(), g_browser_process->local_state());
569 } 564 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698