diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:45:52 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:45:52 +0000 |
| commit | 199b4bd07cbf5ee230be47da9a245cf20edbefc5 (patch) | |
| tree | 032e04f641ccc0899f27ef82eaf664ca88860fbb | |
| parent | b3db76a9b3011041c2c610a8e4b02733c83d8280 (diff) | |
| download | chromium_src-199b4bd07cbf5ee230be47da9a245cf20edbefc5.zip chromium_src-199b4bd07cbf5ee230be47da9a245cf20edbefc5.tar.gz chromium_src-199b4bd07cbf5ee230be47da9a245cf20edbefc5.tar.bz2 | |
aura: Avoid pref crash when using WebKit compositor.
This fixes an issue where we'd attempt to read
auth.allow_cross_origin_prompt before registering it when
building with use_webkit_compositor=1.
We were formerly registering the pref when the IO thread was
created. It looks to me like it only gets accessed in
BrowserProcessImpl, so let's register it there instead.
BUG=103314
TEST=manual: checked that we no longer crash after building with use_webkit_compositor=1
Review URL: http://codereview.chromium.org/8500002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109045 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/io_thread.cc | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 984e89f..36ab753 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -924,9 +924,8 @@ void BrowserProcessImpl::CreateLocalState() { // Initialize the notification for the default browser setting policy. local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, false); - if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) { + if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled)) ApplyDefaultBrowserPolicy(); - } pref_change_registrar_.Add(prefs::kDefaultBrowserSettingEnabled, this); // Initialize the preference for the plugin finder policy. @@ -954,6 +953,8 @@ void BrowserProcessImpl::CreateLocalState() { local_state_->RegisterListPref(prefs::kDisabledSchemes); pref_change_registrar_.Add(prefs::kDisabledSchemes, this); ApplyDisabledSchemesPolicy(); + + local_state_->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); } void BrowserProcessImpl::CreateIconManager() { diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index b4307f18..c86f21e 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -535,7 +535,6 @@ void IOThread::RegisterPrefs(PrefService* local_state) { local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); local_state->RegisterStringPref(prefs::kGSSAPILibraryName, ""); - local_state->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); local_state->RegisterBooleanPref(prefs::kEnableReferrers, true); } |