| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "chrome/browser/ui/webui/settings_utils.h" | 5 #include "chrome/browser/ui/webui/settings_utils.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 break; | 119 break; |
| 120 | 120 |
| 121 case base::nix::DESKTOP_ENVIRONMENT_XFCE: | 121 case base::nix::DESKTOP_ENVIRONMENT_XFCE: |
| 122 case base::nix::DESKTOP_ENVIRONMENT_OTHER: | 122 case base::nix::DESKTOP_ENVIRONMENT_OTHER: |
| 123 break; | 123 break; |
| 124 } | 124 } |
| 125 | 125 |
| 126 if (launched) | 126 if (launched) |
| 127 return; | 127 return; |
| 128 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 128 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 129 base::Bind(&ShowLinuxProxyConfigUrl, render_process_id, render_view_id)); | 129 base::BindOnce(&ShowLinuxProxyConfigUrl, |
| 130 render_process_id, render_view_id)); |
| 130 } | 131 } |
| 131 | 132 |
| 132 } // namespace | 133 } // namespace |
| 133 | 134 |
| 134 namespace settings_utils { | 135 namespace settings_utils { |
| 135 | 136 |
| 136 void ShowNetworkProxySettings(content::WebContents* web_contents) { | 137 void ShowNetworkProxySettings(content::WebContents* web_contents) { |
| 137 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 138 BrowserThread::PostTask( |
| 138 base::Bind(&DetectAndStartProxyConfigUtil, | 139 BrowserThread::FILE, FROM_HERE, |
| 139 web_contents->GetRenderProcessHost()->GetID(), | 140 base::BindOnce(&DetectAndStartProxyConfigUtil, |
| 140 web_contents->GetRenderViewHost()->GetRoutingID())); | 141 web_contents->GetRenderProcessHost()->GetID(), |
| 142 web_contents->GetRenderViewHost()->GetRoutingID())); |
| 141 } | 143 } |
| 142 | 144 |
| 143 } // namespace settings_utils | 145 } // namespace settings_utils |
| OLD | NEW |