diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 23:13:43 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 23:13:43 +0000 |
| commit | d7395e73bc35be3247bdcf5c68fd2fff7497a78c (patch) | |
| tree | 7bb0daf83b0675100a6b974e2342be68fdf1028e /chrome/browser | |
| parent | f9bcd26a1e7bbe4d4f4bbbc72ba40e59d3be1fbb (diff) | |
| download | chromium_src-d7395e73bc35be3247bdcf5c68fd2fff7497a78c.zip chromium_src-d7395e73bc35be3247bdcf5c68fd2fff7497a78c.tar.gz chromium_src-d7395e73bc35be3247bdcf5c68fd2fff7497a78c.tar.bz2 | |
Linux: get GNOME or KDE proxy settings.
BUG=17363, 20407
TEST=none
Review URL: http://codereview.chromium.org/174327
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/options/advanced_contents_gtk.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 891fd71..75711cf 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -43,8 +43,8 @@ namespace { const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL}; const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL}; // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. -// const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; -// const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; +const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; +const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; // The pixel width we wrap labels at. // TODO(evanm): make the labels wrap at the appropriate width. @@ -382,13 +382,13 @@ void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button, } case base::DESKTOP_ENVIRONMENT_KDE3: - // command.argv = kKDE3ProxyConfigCommand; - // found_command = SearchPATH(&command, 1, NULL); + command.argv = kKDE3ProxyConfigCommand; + found_command = SearchPATH(&command, 1, NULL); break; case base::DESKTOP_ENVIRONMENT_KDE4: - // command.argv = kKDE4ProxyConfigCommand; - // found_command = SearchPATH(&command, 1, NULL); + command.argv = kKDE4ProxyConfigCommand; + found_command = SearchPATH(&command, 1, NULL); break; case base::DESKTOP_ENVIRONMENT_OTHER: diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index da77fcf..65671d4 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -102,7 +102,8 @@ static net::ProxyService* CreateProxyService(URLRequestContext* context, proxy_config.get(), use_v8, context, - g_browser_process->io_thread()->message_loop()); + g_browser_process->io_thread()->message_loop(), + g_browser_process->file_thread()->message_loop()); } // static |