diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 19:24:23 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 19:24:23 +0000 |
| commit | 7fe9310614a906818a218c4c20e29930cbae104f (patch) | |
| tree | aef8a684830a9fda296b9f589a5eba66afcc328b /chrome/browser/browser_process_impl.cc | |
| parent | 09a8d917eb7bc6b45277b24a851ccec6e8e499a9 (diff) | |
| download | chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.zip chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.tar.gz chromium_src-7fe9310614a906818a218c4c20e29930cbae104f.tar.bz2 | |
Make CrosSettings and DeviceSettingsService non Lazy instances
BUG=222681
For BrowserProcessImpl change:
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/14200028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index f23eced..365f662 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -116,6 +116,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/memory/oom_priority_manager.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" #endif // defined(OS_CHROMEOS) #if defined(ENABLE_PLUGIN_INSTALLATION) @@ -204,6 +205,11 @@ BrowserProcessImpl::~BrowserProcessImpl() { tracked_objects::ThreadData::EnsureCleanupWasCalled(4); g_browser_process = NULL; + +#if defined(OS_CHROMEOS) + // Initialized in PreCreateThreards() + chromeos::CrosSettings::Shutdown(); +#endif } void BrowserProcessImpl::StartTearDown() { @@ -852,6 +858,9 @@ void BrowserProcessImpl::CreateLocalState() { } void BrowserProcessImpl::PreCreateThreads() { +#if defined(OS_CHROMEOS) + chromeos::CrosSettings::Initialize(); +#endif io_thread_.reset(new IOThread(local_state(), policy_service(), net_log_.get(), extension_event_router_forwarder_.get())); } |