| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 base::Bind(&ShowLinuxProxyConfigUrl, render_process_id, render_view_id)); | 141 base::Bind(&ShowLinuxProxyConfigUrl, render_process_id, render_view_id)); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // anonymous namespace | 144 } // anonymous namespace |
| 145 | 145 |
| 146 void AdvancedOptionsUtilities::ShowNetworkProxySettings( | 146 void AdvancedOptionsUtilities::ShowNetworkProxySettings( |
| 147 WebContents* web_contents) { | 147 WebContents* web_contents) { |
| 148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| 149 base::Bind(&DetectAndStartProxyConfigUtil, | 149 base::Bind(&DetectAndStartProxyConfigUtil, |
| 150 web_contents->GetRenderProcessHost()->GetID(), | 150 web_contents->GetRenderProcessHost()->GetID(), |
| 151 web_contents->GetRenderViewHost()->routing_id())); | 151 web_contents->GetRenderViewHost()->GetRoutingID())); |
| 152 } | 152 } |
| 153 | 153 |
| 154 #endif // !defined(OS_CHROMEOS) | 154 #endif // !defined(OS_CHROMEOS) |
| OLD | NEW |