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" |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 case HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST: | 476 case HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST: |
477 host_zoom_map->SetZoomLevelForHostAndScheme(change.scheme, | 477 host_zoom_map->SetZoomLevelForHostAndScheme(change.scheme, |
478 change.host, | 478 change.host, |
479 change.zoom_level); | 479 change.zoom_level); |
480 return; | 480 return; |
481 } | 481 } |
482 } | 482 } |
483 | 483 |
484 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 484 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
485 #if defined(OS_CHROMEOS) | 485 #if defined(OS_CHROMEOS) |
486 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 486 if (IsLoginProfile()) { |
487 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 487 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
488 g_browser_process->local_state()); | 488 g_browser_process->local_state()); |
489 } | 489 } |
490 #endif // defined(OS_CHROMEOS) | 490 #endif // defined(OS_CHROMEOS) |
491 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 491 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
492 GetPrefs(), g_browser_process->local_state()); | 492 GetPrefs(), g_browser_process->local_state()); |
493 } | 493 } |
OLD | NEW |