diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 17:09:10 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 17:09:10 +0000 |
| commit | 86c6b9e3ffc13f4dde688ab918d77b4a753c1c3a (patch) | |
| tree | 27f6497a09626a37fc6986aaf60da608b8a1414b /chrome/browser/prefs/browser_prefs.cc | |
| parent | 80e92967fa65751e7794aadaa89d5d9ee7a25351 (diff) | |
| download | chromium_src-86c6b9e3ffc13f4dde688ab918d77b4a753c1c3a.zip chromium_src-86c6b9e3ffc13f4dde688ab918d77b4a753c1c3a.tar.gz chromium_src-86c6b9e3ffc13f4dde688ab918d77b4a753c1c3a.tar.bz2 | |
Remove race condition when installing default apps into a new profile.
BUG=99547
TEST=Install chrome and stop it as quickly as possible when the window opens.
Or create a new profile and close all windows as soon as the new profile's
window opens. Do that as often as you like. Make sure that eventually,
after leaving the windows open, that all default apps are correctly installed.
Review URL: http://codereview.chromium.org/8245018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index f82d27d..e9a6dfe 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -87,6 +87,8 @@ #include "chrome/browser/chromeos/status/input_method_menu.h" #include "chrome/browser/chromeos/status/network_menu_button.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" +#else +#include "chrome/browser/extensions/default_apps.h" #endif namespace browser { @@ -185,6 +187,9 @@ void RegisterUserPrefs(PrefService* user_prefs) { #endif SyncPromoUI::RegisterUserPrefs(user_prefs); chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); +#if !defined(OS_CHROMEOS) + default_apps::RegisterUserPrefs(user_prefs); +#endif } void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) { |