| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 #if defined(OS_WIN) | 107 #if defined(OS_WIN) |
| 108 #include "chrome/browser/instant/promo_counter.h" | 108 #include "chrome/browser/instant/promo_counter.h" |
| 109 #include "chrome/browser/password_manager/password_store_win.h" | 109 #include "chrome/browser/password_manager/password_store_win.h" |
| 110 #include "chrome/installer/util/install_util.h" | 110 #include "chrome/installer/util/install_util.h" |
| 111 #elif defined(OS_MACOSX) | 111 #elif defined(OS_MACOSX) |
| 112 #include "chrome/browser/keychain_mac.h" | 112 #include "chrome/browser/keychain_mac.h" |
| 113 #include "chrome/browser/password_manager/password_store_mac.h" | 113 #include "chrome/browser/password_manager/password_store_mac.h" |
| 114 #elif defined(OS_CHROMEOS) | 114 #elif defined(OS_CHROMEOS) |
| 115 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 115 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
| 116 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | |
| 117 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) | 116 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) |
| 118 #include "base/nix/xdg_util.h" | 117 #include "base/nix/xdg_util.h" |
| 119 #if defined(USE_GNOME_KEYRING) | 118 #if defined(USE_GNOME_KEYRING) |
| 120 #include "chrome/browser/password_manager/native_backend_gnome_x.h" | 119 #include "chrome/browser/password_manager/native_backend_gnome_x.h" |
| 121 #endif | 120 #endif |
| 122 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" | 121 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" |
| 123 #include "chrome/browser/password_manager/password_store_x.h" | 122 #include "chrome/browser/password_manager/password_store_x.h" |
| 124 #endif | 123 #endif |
| 125 | 124 |
| 126 #if defined(OS_CHROMEOS) | 125 #if defined(OS_CHROMEOS) |
| (...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1499 local_state->SetString(prefs::kApplicationLocale, new_locale); | 1498 local_state->SetString(prefs::kApplicationLocale, new_locale); |
| 1500 | 1499 |
| 1501 GetPrefs()->ScheduleSavePersistentPrefs(); | 1500 GetPrefs()->ScheduleSavePersistentPrefs(); |
| 1502 local_state->ScheduleSavePersistentPrefs(); | 1501 local_state->ScheduleSavePersistentPrefs(); |
| 1503 } | 1502 } |
| 1504 | 1503 |
| 1505 void ProfileImpl::OnLogin() { | 1504 void ProfileImpl::OnLogin() { |
| 1506 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); | 1505 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); |
| 1507 } | 1506 } |
| 1508 | 1507 |
| 1509 chromeos::ProxyConfigServiceImpl* | |
| 1510 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | |
| 1511 if (!chromeos_proxy_config_service_impl_) { | |
| 1512 chromeos_proxy_config_service_impl_ = | |
| 1513 new chromeos::ProxyConfigServiceImpl(); | |
| 1514 } | |
| 1515 return chromeos_proxy_config_service_impl_; | |
| 1516 } | |
| 1517 | |
| 1518 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { | 1508 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { |
| 1519 DCHECK(!chromeos_enterprise_extension_observer_.get()); | 1509 DCHECK(!chromeos_enterprise_extension_observer_.get()); |
| 1520 chromeos_enterprise_extension_observer_.reset( | 1510 chromeos_enterprise_extension_observer_.reset( |
| 1521 new chromeos::EnterpriseExtensionObserver(this)); | 1511 new chromeos::EnterpriseExtensionObserver(this)); |
| 1522 } | 1512 } |
| 1523 | 1513 |
| 1524 void ProfileImpl::InitChromeOSPreferences() { | 1514 void ProfileImpl::InitChromeOSPreferences() { |
| 1525 chromeos_preferences_.reset(new chromeos::Preferences()); | 1515 chromeos_preferences_.reset(new chromeos::Preferences()); |
| 1526 chromeos_preferences_->Init(GetPrefs()); | 1516 chromeos_preferences_->Init(GetPrefs()); |
| 1527 } | 1517 } |
| 1528 #endif // defined(OS_CHROMEOS) | 1518 #endif // defined(OS_CHROMEOS) |
| 1529 | 1519 |
| 1530 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1520 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
| 1531 if (!pref_proxy_config_tracker_) | 1521 if (!pref_proxy_config_tracker_) |
| 1532 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); | 1522 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); |
| 1533 | 1523 |
| 1534 return pref_proxy_config_tracker_; | 1524 return pref_proxy_config_tracker_; |
| 1535 } | 1525 } |
| 1536 | 1526 |
| 1537 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1527 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
| 1538 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) | 1528 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) |
| 1539 return NULL; | 1529 return NULL; |
| 1540 if (!prerender_manager_) | 1530 if (!prerender_manager_) |
| 1541 prerender_manager_ = new prerender::PrerenderManager(this); | 1531 prerender_manager_ = new prerender::PrerenderManager(this); |
| 1542 return prerender_manager_; | 1532 return prerender_manager_; |
| 1543 } | 1533 } |
| OLD | NEW |