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

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, 9 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 1373 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 local_state->SetString(prefs::kApplicationLocale, new_locale); 1499 local_state->SetString(prefs::kApplicationLocale, new_locale);
1501 1500
1502 GetPrefs()->ScheduleSavePersistentPrefs(); 1501 GetPrefs()->ScheduleSavePersistentPrefs();
1503 local_state->ScheduleSavePersistentPrefs(); 1502 local_state->ScheduleSavePersistentPrefs();
1504 } 1503 }
1505 1504
1506 void ProfileImpl::OnLogin() { 1505 void ProfileImpl::OnLogin() {
1507 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this)); 1506 locale_change_guard_.reset(new chromeos::LocaleChangeGuard(this));
1508 } 1507 }
1509 1508
1510 chromeos::ProxyConfigServiceImpl*
1511 ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
1512 if (!chromeos_proxy_config_service_impl_) {
1513 chromeos_proxy_config_service_impl_ =
1514 new chromeos::ProxyConfigServiceImpl();
1515 }
1516 return chromeos_proxy_config_service_impl_;
1517 }
1518
1519 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { 1509 void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() {
1520 DCHECK(!chromeos_enterprise_extension_observer_.get()); 1510 DCHECK(!chromeos_enterprise_extension_observer_.get());
1521 chromeos_enterprise_extension_observer_.reset( 1511 chromeos_enterprise_extension_observer_.reset(
1522 new chromeos::EnterpriseExtensionObserver(this)); 1512 new chromeos::EnterpriseExtensionObserver(this));
1523 } 1513 }
1524 1514
1525 void ProfileImpl::InitChromeOSPreferences() { 1515 void ProfileImpl::InitChromeOSPreferences() {
1526 chromeos_preferences_.reset(new chromeos::Preferences()); 1516 chromeos_preferences_.reset(new chromeos::Preferences());
1527 chromeos_preferences_->Init(GetPrefs()); 1517 chromeos_preferences_->Init(GetPrefs());
1528 } 1518 }
1529 #endif // defined(OS_CHROMEOS) 1519 #endif // defined(OS_CHROMEOS)
1530 1520
1531 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { 1521 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
1532 if (!pref_proxy_config_tracker_) 1522 if (!pref_proxy_config_tracker_)
1533 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); 1523 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
1534 1524
1535 return pref_proxy_config_tracker_; 1525 return pref_proxy_config_tracker_;
1536 } 1526 }
1537 1527
1538 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1528 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1539 if (!prerender::PrerenderManager::IsPrerenderingEnabled()) 1529 if (!prerender::PrerenderManager::IsPrerenderingEnabled())
1540 return NULL; 1530 return NULL;
1541 if (!prerender_manager_) 1531 if (!prerender_manager_)
1542 prerender_manager_ = new prerender::PrerenderManager(this); 1532 prerender_manager_ = new prerender::PrerenderManager(this);
1543 return prerender_manager_; 1533 return prerender_manager_;
1544 } 1534 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698