diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 01:46:08 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 01:46:08 +0000 |
| commit | 398206ce0943c935a8da55d382e60e7be16099cf (patch) | |
| tree | f45ab7ef6f6c101b142a7d5c1393c6455caf2e70 /chrome/browser/browser_prefs.cc | |
| parent | 0965c6d6d392916a4017bce6ddf5fef8d5bcd22a (diff) | |
| download | chromium_src-398206ce0943c935a8da55d382e60e7be16099cf.zip chromium_src-398206ce0943c935a8da55d382e60e7be16099cf.tar.gz chromium_src-398206ce0943c935a8da55d382e60e7be16099cf.tar.bz2 | |
Added BackgroundContentsService to manage lifecycle of BackgroundContents.
If --restore-background-contents flag is passed, stores the URLs of running
BackgroundContents in preferences so they can be re-launched when the browser
restarts.
Moved logic to shutdown background contents into BackgroundContentsService so
we can use this to coordinate when to keep the browser process running.
BUG=43382
TEST=new tests
Review URL: http://codereview.chromium.org/2104018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 816c50b..251a4f0 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -5,6 +5,7 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/autofill/autofill_manager.h" +#include "chrome/browser/background_contents_service.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_shutdown.h" @@ -126,6 +127,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { #if defined(OS_CHROMEOS) chromeos::Preferences::RegisterUserPrefs(user_prefs); #endif + BackgroundContentsService::RegisterUserPrefs(user_prefs); } } // namespace browser |