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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 explicit GuestSessionProfile(Profile* real_profile) | 482 explicit GuestSessionProfile(Profile* real_profile) |
483 : OffTheRecordProfileImpl(real_profile) { | 483 : OffTheRecordProfileImpl(real_profile) { |
484 } | 484 } |
485 | 485 |
486 virtual ProfileType GetProfileType() const OVERRIDE { | 486 virtual ProfileType GetProfileType() const OVERRIDE { |
487 return GUEST_PROFILE; | 487 return GUEST_PROFILE; |
488 } | 488 } |
489 | 489 |
490 virtual void InitChromeOSPreferences() OVERRIDE { | 490 virtual void InitChromeOSPreferences() OVERRIDE { |
491 chromeos_preferences_.reset(new chromeos::Preferences()); | 491 chromeos_preferences_.reset(new chromeos::Preferences()); |
492 chromeos_preferences_->Init(static_cast<PrefServiceSyncable*>(GetPrefs()), | 492 chromeos_preferences_->Init( |
493 chromeos::UserManager::Get()->GetActiveUser()); | 493 static_cast<PrefServiceSyncable*>(GetPrefs()), |
| 494 user_manager::UserManager::Get()->GetActiveUser()); |
494 } | 495 } |
495 | 496 |
496 private: | 497 private: |
497 // The guest user should be able to customize Chrome OS preferences. | 498 // The guest user should be able to customize Chrome OS preferences. |
498 scoped_ptr<chromeos::Preferences> chromeos_preferences_; | 499 scoped_ptr<chromeos::Preferences> chromeos_preferences_; |
499 }; | 500 }; |
500 #endif | 501 #endif |
501 | 502 |
502 Profile* Profile::CreateOffTheRecordProfile() { | 503 Profile* Profile::CreateOffTheRecordProfile() { |
503 OffTheRecordProfileImpl* profile = NULL; | 504 OffTheRecordProfileImpl* profile = NULL; |
(...skipping 27 matching lines...) Expand all Loading... |
531 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 532 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
532 #if defined(OS_CHROMEOS) | 533 #if defined(OS_CHROMEOS) |
533 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 534 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
534 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 535 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
535 g_browser_process->local_state()); | 536 g_browser_process->local_state()); |
536 } | 537 } |
537 #endif // defined(OS_CHROMEOS) | 538 #endif // defined(OS_CHROMEOS) |
538 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 539 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
539 GetPrefs(), g_browser_process->local_state()); | 540 GetPrefs(), g_browser_process->local_state()); |
540 } | 541 } |
OLD | NEW |