OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #if !defined(OS_CHROMEOS) | 5 #if !defined(OS_CHROMEOS) |
6 | 6 |
7 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" | 7 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/nix/xdg_util.h" | 13 #include "base/nix/xdg_util.h" |
14 #include "base/process_util.h" | 14 #include "base/process_util.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "content/browser/tab_contents/tab_contents.h" | 16 #include "content/browser/tab_contents/tab_contents.h" |
17 #include "content/common/process_watcher.h" | 17 #include "content/common/process_watcher.h" |
18 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
19 | 19 |
| 20 using content::BrowserThread; |
| 21 |
20 // Command used to configure GNOME 2 proxy settings. | 22 // Command used to configure GNOME 2 proxy settings. |
21 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL}; | 23 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL}; |
22 // In GNOME 3, we might need to run gnome-control-center instead. We try this | 24 // In GNOME 3, we might need to run gnome-control-center instead. We try this |
23 // only after gnome-network-properties is not found, because older GNOME also | 25 // only after gnome-network-properties is not found, because older GNOME also |
24 // has this but it doesn't do the same thing. See below where we use it. | 26 // has this but it doesn't do the same thing. See below where we use it. |
25 const char* kGNOME3ProxyConfigCommand[] = {"gnome-control-center", "network", | 27 const char* kGNOME3ProxyConfigCommand[] = {"gnome-control-center", "network", |
26 NULL}; | 28 NULL}; |
27 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. | 29 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. |
28 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; | 30 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; |
29 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; | 31 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 | 132 |
131 } // anonymous namespace | 133 } // anonymous namespace |
132 | 134 |
133 void AdvancedOptionsUtilities::ShowNetworkProxySettings( | 135 void AdvancedOptionsUtilities::ShowNetworkProxySettings( |
134 TabContents* tab_contents) { | 136 TabContents* tab_contents) { |
135 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 137 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
136 base::Bind(&DetectAndStartProxyConfigUtil, tab_contents)); | 138 base::Bind(&DetectAndStartProxyConfigUtil, tab_contents)); |
137 } | 139 } |
138 | 140 |
139 #endif // !defined(OS_CHROMEOS) | 141 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |