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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
104 | 104 |
105 #if defined(OS_WIN) | 105 #if defined(OS_WIN) |
106 #include "chrome/browser/instant/promo_counter.h" | 106 #include "chrome/browser/instant/promo_counter.h" |
107 #include "chrome/browser/password_manager/password_store_win.h" | 107 #include "chrome/browser/password_manager/password_store_win.h" |
108 #include "chrome/installer/util/install_util.h" | 108 #include "chrome/installer/util/install_util.h" |
109 #elif defined(OS_MACOSX) | 109 #elif defined(OS_MACOSX) |
110 #include "chrome/browser/keychain_mac.h" | 110 #include "chrome/browser/keychain_mac.h" |
111 #include "chrome/browser/password_manager/password_store_mac.h" | 111 #include "chrome/browser/password_manager/password_store_mac.h" |
112 #elif defined(OS_CHROMEOS) | 112 #elif defined(OS_CHROMEOS) |
113 #include "chrome/browser/chromeos/enterprise_extension_observer.h" | 113 #include "chrome/browser/chromeos/enterprise_extension_observer.h" |
114 #include "chrome/browser/chromeos/proxy_config_service_impl.h" | 114 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
kuan
2011/02/18 16:29:31
is this still needed?
battre
2011/02/21 17:27:58
Done.
| |
115 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) | 115 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) |
116 #include "base/nix/xdg_util.h" | 116 #include "base/nix/xdg_util.h" |
117 #if defined(USE_GNOME_KEYRING) | 117 #if defined(USE_GNOME_KEYRING) |
118 #include "chrome/browser/password_manager/native_backend_gnome_x.h" | 118 #include "chrome/browser/password_manager/native_backend_gnome_x.h" |
119 #endif | 119 #endif |
120 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" | 120 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" |
121 #include "chrome/browser/password_manager/password_store_x.h" | 121 #include "chrome/browser/password_manager/password_store_x.h" |
122 #endif | 122 #endif |
123 | 123 |
124 #if defined(OS_CHROMEOS) | 124 #if defined(OS_CHROMEOS) |
(...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1469 if (do_update_pref) | 1469 if (do_update_pref) |
1470 GetPrefs()->SetString(prefs::kApplicationLocale, new_locale); | 1470 GetPrefs()->SetString(prefs::kApplicationLocale, new_locale); |
1471 if (chromeos::UserManager::Get()->current_user_is_owner()) | 1471 if (chromeos::UserManager::Get()->current_user_is_owner()) |
1472 local_state->SetString(prefs::kOwnerLocale, new_locale); | 1472 local_state->SetString(prefs::kOwnerLocale, new_locale); |
1473 local_state->SetString(prefs::kApplicationLocale, new_locale); | 1473 local_state->SetString(prefs::kApplicationLocale, new_locale); |
1474 | 1474 |
1475 GetPrefs()->ScheduleSavePersistentPrefs(); | 1475 GetPrefs()->ScheduleSavePersistentPrefs(); |
1476 local_state->ScheduleSavePersistentPrefs(); | 1476 local_state->ScheduleSavePersistentPrefs(); |
1477 } | 1477 } |
1478 | 1478 |
1479 chromeos::ProxyConfigServiceImpl* | |
1480 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | |
1481 if (!chromeos_proxy_config_service_impl_) { | |
1482 chromeos_proxy_config_service_impl_ = | |
1483 new chromeos::ProxyConfigServiceImpl(); | |
1484 } | |
1485 return chromeos_proxy_config_service_impl_; | |
1486 } | |
1487 | |
1488 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { | 1479 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { |
1489 DCHECK(!chromeos_enterprise_extension_observer_.get()); | 1480 DCHECK(!chromeos_enterprise_extension_observer_.get()); |
1490 chromeos_enterprise_extension_observer_.reset( | 1481 chromeos_enterprise_extension_observer_.reset( |
1491 new chromeos::EnterpriseExtensionObserver(this)); | 1482 new chromeos::EnterpriseExtensionObserver(this)); |
1492 } | 1483 } |
1493 | 1484 |
1494 void ProfileImpl::InitChromeOSPreferences() { | 1485 void ProfileImpl::InitChromeOSPreferences() { |
1495 chromeos_preferences_.reset(new chromeos::Preferences()); | 1486 chromeos_preferences_.reset(new chromeos::Preferences()); |
1496 chromeos_preferences_->Init(GetPrefs()); | 1487 chromeos_preferences_->Init(GetPrefs()); |
1497 } | 1488 } |
1498 #endif // defined(OS_CHROMEOS) | 1489 #endif // defined(OS_CHROMEOS) |
1499 | 1490 |
1500 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1491 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
1501 if (!pref_proxy_config_tracker_) | 1492 if (!pref_proxy_config_tracker_) |
1502 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); | 1493 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); |
1503 | 1494 |
1504 return pref_proxy_config_tracker_; | 1495 return pref_proxy_config_tracker_; |
1505 } | 1496 } |
1506 | 1497 |
1507 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1498 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
1508 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) | 1499 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) |
1509 return NULL; | 1500 return NULL; |
1510 if (!prerender_manager_) | 1501 if (!prerender_manager_) |
1511 prerender_manager_ = new prerender::PrerenderManager(this); | 1502 prerender_manager_ = new prerender::PrerenderManager(this); |
1512 return prerender_manager_; | 1503 return prerender_manager_; |
1513 } | 1504 } |
OLD | NEW |