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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 6484033: Fix a bug that caused Chrome OS system preferences not to work in the guest mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rework again! 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 0fde233bb4f650cf68b64be3afbf3661e5a2ed06..459c1de2fcaab38303f8c793a65f31f6a44dc0b8 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -313,11 +313,6 @@ ProfileImpl::ProfileImpl(const FilePath& path)
ssl_config_service_manager_.reset(
SSLConfigServiceManager::CreateDefaultManager(this));
-#if defined(OS_CHROMEOS)
- chromeos_preferences_.reset(new chromeos::Preferences());
- chromeos_preferences_->Init(prefs);
-#endif
-
pinned_tab_service_.reset(new PinnedTabService(this));
// Initialize the BackgroundModeManager - this has to be done here before
@@ -1490,6 +1485,11 @@ void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() {
chromeos_enterprise_extension_observer_.reset(
new chromeos::EnterpriseExtensionObserver(this));
}
+
+void ProfileImpl::InitChromeOSPreferences() {
+ chromeos_preferences_.reset(new chromeos::Preferences());
+ chromeos_preferences_->Init(GetPrefs());
+}
#endif // defined(OS_CHROMEOS)
PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698