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

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

Issue 584163004: Move web_request directory to //extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 6 years, 2 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 "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"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
65 #include "chrome/browser/chromeos/preferences.h" 65 #include "chrome/browser/chromeos/preferences.h"
66 #include "chrome/browser/chromeos/profiles/profile_helper.h" 66 #include "chrome/browser/chromeos/profiles/profile_helper.h"
67 #endif 67 #endif
68 68
69 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 69 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
70 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 70 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
71 #endif 71 #endif
72 72
73 #if defined(ENABLE_EXTENSIONS) 73 #if defined(ENABLE_EXTENSIONS)
74 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 74 #include "extensions/browser/api/web_request/web_request_api.h"
75 #include "extensions/browser/extension_system.h" 75 #include "extensions/browser/extension_system.h"
76 #include "extensions/browser/guest_view/guest_view_manager.h" 76 #include "extensions/browser/guest_view/guest_view_manager.h"
77 #include "extensions/common/extension.h" 77 #include "extensions/common/extension.h"
78 #endif 78 #endif
79 79
80 using content::BrowserThread; 80 using content::BrowserThread;
81 using content::DownloadManagerDelegate; 81 using content::DownloadManagerDelegate;
82 using content::HostZoomMap; 82 using content::HostZoomMap;
83 83
84 #if defined(ENABLE_EXTENSIONS) 84 #if defined(ENABLE_EXTENSIONS)
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 536 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
537 #if defined(OS_CHROMEOS) 537 #if defined(OS_CHROMEOS)
538 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 538 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
539 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 539 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
540 g_browser_process->local_state()); 540 g_browser_process->local_state());
541 } 541 }
542 #endif // defined(OS_CHROMEOS) 542 #endif // defined(OS_CHROMEOS)
543 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 543 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
544 GetPrefs(), g_browser_process->local_state()); 544 GetPrefs(), g_browser_process->local_state());
545 } 545 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_extensions_network_delegate.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698