| 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 : OffTheRecordProfileImpl(real_profile) { | 476 : OffTheRecordProfileImpl(real_profile) { |
| 477 } | 477 } |
| 478 | 478 |
| 479 virtual ProfileType GetProfileType() const OVERRIDE { | 479 virtual ProfileType GetProfileType() const OVERRIDE { |
| 480 return GUEST_PROFILE; | 480 return GUEST_PROFILE; |
| 481 } | 481 } |
| 482 | 482 |
| 483 virtual void InitChromeOSPreferences() OVERRIDE { | 483 virtual void InitChromeOSPreferences() OVERRIDE { |
| 484 chromeos_preferences_.reset(new chromeos::Preferences()); | 484 chromeos_preferences_.reset(new chromeos::Preferences()); |
| 485 chromeos_preferences_->Init(static_cast<PrefServiceSyncable*>(GetPrefs()), | 485 chromeos_preferences_->Init(static_cast<PrefServiceSyncable*>(GetPrefs()), |
| 486 chromeos::UserManager::Get()->GetActiveUser()); | 486 chromeos::GetUserManager()->GetActiveUser()); |
| 487 } | 487 } |
| 488 | 488 |
| 489 private: | 489 private: |
| 490 // The guest user should be able to customize Chrome OS preferences. | 490 // The guest user should be able to customize Chrome OS preferences. |
| 491 scoped_ptr<chromeos::Preferences> chromeos_preferences_; | 491 scoped_ptr<chromeos::Preferences> chromeos_preferences_; |
| 492 }; | 492 }; |
| 493 #endif | 493 #endif |
| 494 | 494 |
| 495 Profile* Profile::CreateOffTheRecordProfile() { | 495 Profile* Profile::CreateOffTheRecordProfile() { |
| 496 OffTheRecordProfileImpl* profile = NULL; | 496 OffTheRecordProfileImpl* profile = NULL; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 524 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 524 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
| 525 #if defined(OS_CHROMEOS) | 525 #if defined(OS_CHROMEOS) |
| 526 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 526 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 527 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 527 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 528 g_browser_process->local_state()); | 528 g_browser_process->local_state()); |
| 529 } | 529 } |
| 530 #endif // defined(OS_CHROMEOS) | 530 #endif // defined(OS_CHROMEOS) |
| 531 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 531 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 532 GetPrefs(), g_browser_process->local_state()); | 532 GetPrefs(), g_browser_process->local_state()); |
| 533 } | 533 } |
| OLD | NEW |