OLD | NEW |
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/path_service.h" | |
13 #include "base/prefs/json_pref_store.h" | 12 #include "base/prefs/json_pref_store.h" |
14 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
16 #include "build/build_config.h" | 15 #include "build/build_config.h" |
17 #include "chrome/browser/background/background_contents_service_factory.h" | 16 #include "chrome/browser/background/background_contents_service_factory.h" |
18 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/dom_distiller/profile_utils.h" | 18 #include "chrome/browser/dom_distiller/profile_utils.h" |
20 #include "chrome/browser/download/chrome_download_manager_delegate.h" | 19 #include "chrome/browser/download/chrome_download_manager_delegate.h" |
21 #include "chrome/browser/download/download_service.h" | 20 #include "chrome/browser/download/download_service.h" |
22 #include "chrome/browser/download/download_service_factory.h" | 21 #include "chrome/browser/download/download_service_factory.h" |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 529 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
531 #if defined(OS_CHROMEOS) | 530 #if defined(OS_CHROMEOS) |
532 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 531 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
533 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 532 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
534 g_browser_process->local_state()); | 533 g_browser_process->local_state()); |
535 } | 534 } |
536 #endif // defined(OS_CHROMEOS) | 535 #endif // defined(OS_CHROMEOS) |
537 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 536 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
538 GetPrefs(), g_browser_process->local_state()); | 537 GetPrefs(), g_browser_process->local_state()); |
539 } | 538 } |
OLD | NEW |