diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 23:49:27 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 23:49:27 +0000 |
| commit | 32addfb4430046464b76199bcffdccd0b031156f (patch) | |
| tree | 6b5a44ff01c2abe6dc51c55d402781043cd40758 /chrome/browser/gtk | |
| parent | 7fbe2c4407e3cdac23d21c0a5b8777866234335a (diff) | |
| download | chromium_src-32addfb4430046464b76199bcffdccd0b031156f.zip chromium_src-32addfb4430046464b76199bcffdccd0b031156f.tar.gz chromium_src-32addfb4430046464b76199bcffdccd0b031156f.tar.bz2 | |
Temporarily allow IO on UI thread when accessing Linux/GTK proxy settings.
BUG=63690
TEST=accessing proxy settings on a debug build doesn't crash
Review URL: http://codereview.chromium.org/5131002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/options/advanced_contents_gtk.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 6ea7a49..26238b1 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -19,6 +19,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_tokenizer.h" +#include "base/thread_restrictions.h" #include "base/nix/xdg_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -423,6 +424,10 @@ void NetworkSection::NotifyPrefChanged(const std::string* pref_name) { // static void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button, NetworkSection* section) { + // Changing proxy settings searches the disk for the proxy configuration + // binary. Temporarily allow IO for now, see http://crbug.com/63690 + base::ThreadRestrictions::ScopedAllowIO allow_io; + section->UserMetricsRecordAction(UserMetricsAction("Options_ChangeProxies"), NULL); |