Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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"
115 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS) 114 #elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
116 #include "base/nix/xdg_util.h" 115 #include "base/nix/xdg_util.h"
117 #if defined(USE_GNOME_KEYRING) 116 #if defined(USE_GNOME_KEYRING)
118 #include "chrome/browser/password_manager/native_backend_gnome_x.h" 117 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
119 #endif 118 #endif
120 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" 119 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
121 #include "chrome/browser/password_manager/password_store_x.h" 120 #include "chrome/browser/password_manager/password_store_x.h"
122 #endif 121 #endif
123 122
124 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
(...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 if (do_update_pref) 1468 if (do_update_pref)
1470 GetPrefs()->SetString(prefs::kApplicationLocale, new_locale); 1469 GetPrefs()->SetString(prefs::kApplicationLocale, new_locale);
1471 if (chromeos::UserManager::Get()->current_user_is_owner()) 1470 if (chromeos::UserManager::Get()->current_user_is_owner())
1472 local_state->SetString(prefs::kOwnerLocale, new_locale); 1471 local_state->SetString(prefs::kOwnerLocale, new_locale);
1473 local_state->SetString(prefs::kApplicationLocale, new_locale); 1472 local_state->SetString(prefs::kApplicationLocale, new_locale);
1474 1473
1475 GetPrefs()->ScheduleSavePersistentPrefs(); 1474 GetPrefs()->ScheduleSavePersistentPrefs();
1476 local_state->ScheduleSavePersistentPrefs(); 1475 local_state->ScheduleSavePersistentPrefs();
1477 } 1476 }
1478 1477
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() { 1478 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() {
1489 DCHECK(!chromeos_enterprise_extension_observer_.get()); 1479 DCHECK(!chromeos_enterprise_extension_observer_.get());
1490 chromeos_enterprise_extension_observer_.reset( 1480 chromeos_enterprise_extension_observer_.reset(
1491 new chromeos::EnterpriseExtensionObserver(this)); 1481 new chromeos::EnterpriseExtensionObserver(this));
1492 } 1482 }
1493 1483
1494 void ProfileImpl::InitChromeOSPreferences() { 1484 void ProfileImpl::InitChromeOSPreferences() {
1495 chromeos_preferences_.reset(new chromeos::Preferences()); 1485 chromeos_preferences_.reset(new chromeos::Preferences());
1496 chromeos_preferences_->Init(GetPrefs()); 1486 chromeos_preferences_->Init(GetPrefs());
1497 } 1487 }
1498 #endif // defined(OS_CHROMEOS) 1488 #endif // defined(OS_CHROMEOS)
1499 1489
1500 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { 1490 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
1501 if (!pref_proxy_config_tracker_) 1491 if (!pref_proxy_config_tracker_)
1502 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); 1492 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
1503 1493
1504 return pref_proxy_config_tracker_; 1494 return pref_proxy_config_tracker_;
1505 } 1495 }
1506 1496
1507 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1497 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1508 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1498 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1509 return NULL; 1499 return NULL;
1510 if (!prerender_manager_) 1500 if (!prerender_manager_)
1511 prerender_manager_ = new prerender::PrerenderManager(this); 1501 prerender_manager_ = new prerender::PrerenderManager(this);
1512 return prerender_manager_; 1502 return prerender_manager_;
1513 } 1503 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698