| 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 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 RequestHandle* /*request_handle*/, | 128 RequestHandle* /*request_handle*/, |
| 129 const BoundNetLog& /*net_log*/) { | 129 const BoundNetLog& /*net_log*/) { |
| 130 NOTREACHED(); | 130 NOTREACHED(); |
| 131 return ERR_UNEXPECTED; | 131 return ERR_UNEXPECTED; |
| 132 } | 132 } |
| 133 | 133 |
| 134 virtual void CancelRequest(RequestHandle request_handle) { | 134 virtual void CancelRequest(RequestHandle request_handle) { |
| 135 NOTREACHED(); | 135 NOTREACHED(); |
| 136 } | 136 } |
| 137 | 137 |
| 138 virtual LoadState GetLoadState(RequestHandle request_handle) const { |
| 139 NOTREACHED(); |
| 140 return LOAD_STATE_IDLE; |
| 141 } |
| 142 |
| 138 virtual void CancelSetPacScript() { | 143 virtual void CancelSetPacScript() { |
| 139 NOTREACHED(); | 144 NOTREACHED(); |
| 140 } | 145 } |
| 141 | 146 |
| 142 virtual int SetPacScript( | 147 virtual int SetPacScript( |
| 143 const scoped_refptr<ProxyResolverScriptData>& script_data, | 148 const scoped_refptr<ProxyResolverScriptData>& script_data, |
| 144 OldCompletionCallback* callback) { | 149 OldCompletionCallback* callback) { |
| 145 | 150 |
| 146 const GURL url = | 151 const GURL url = |
| 147 script_data->type() == ProxyResolverScriptData::TYPE_SCRIPT_URL ? | 152 script_data->type() == ProxyResolverScriptData::TYPE_SCRIPT_URL ? |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 | 700 |
| 696 // Run the message loop to let the DHCP fetch complete and post the results | 701 // Run the message loop to let the DHCP fetch complete and post the results |
| 697 // back. Before the fix linked to above, this would try to invoke on | 702 // back. Before the fix linked to above, this would try to invoke on |
| 698 // the callback object provided by InitProxyResolver after it was | 703 // the callback object provided by InitProxyResolver after it was |
| 699 // no longer valid. | 704 // no longer valid. |
| 700 MessageLoop::current()->RunAllPending(); | 705 MessageLoop::current()->RunAllPending(); |
| 701 } | 706 } |
| 702 | 707 |
| 703 } // namespace | 708 } // namespace |
| 704 } // namespace net | 709 } // namespace net |
| OLD | NEW |