| OLD | NEW |
| 1 // Copyright (c) 2012 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 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 5 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1548 response->extension_id, response->extension_install_time, | 1548 response->extension_id, response->extension_install_time, |
| 1549 response->cancel, old_headers, new_headers); | 1549 response->cancel, old_headers, new_headers); |
| 1550 } | 1550 } |
| 1551 case ExtensionWebRequestEventRouter::kOnHeadersReceived: { | 1551 case ExtensionWebRequestEventRouter::kOnHeadersReceived: { |
| 1552 const net::HttpResponseHeaders* old_headers = | 1552 const net::HttpResponseHeaders* old_headers = |
| 1553 blocked_request->original_response_headers.get(); | 1553 blocked_request->original_response_headers.get(); |
| 1554 helpers::ResponseHeaders* new_headers = | 1554 helpers::ResponseHeaders* new_headers = |
| 1555 response->response_headers.get(); | 1555 response->response_headers.get(); |
| 1556 return helpers::CalculateOnHeadersReceivedDelta( | 1556 return helpers::CalculateOnHeadersReceivedDelta( |
| 1557 response->extension_id, response->extension_install_time, | 1557 response->extension_id, response->extension_install_time, |
| 1558 response->cancel, old_headers, new_headers); | 1558 response->cancel, response->new_url, old_headers, new_headers); |
| 1559 } | 1559 } |
| 1560 case ExtensionWebRequestEventRouter::kOnAuthRequired: | 1560 case ExtensionWebRequestEventRouter::kOnAuthRequired: |
| 1561 return helpers::CalculateOnAuthRequiredDelta( | 1561 return helpers::CalculateOnAuthRequiredDelta( |
| 1562 response->extension_id, response->extension_install_time, | 1562 response->extension_id, response->extension_install_time, |
| 1563 response->cancel, &response->auth_credentials); | 1563 response->cancel, &response->auth_credentials); |
| 1564 default: | 1564 default: |
| 1565 NOTREACHED(); | 1565 NOTREACHED(); |
| 1566 break; | 1566 break; |
| 1567 } | 1567 } |
| 1568 return NULL; | 1568 return NULL; |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2380 } else if ((*it)->name().find("AdBlock") != std::string::npos) { | 2380 } else if ((*it)->name().find("AdBlock") != std::string::npos) { |
| 2381 adblock = true; | 2381 adblock = true; |
| 2382 } else { | 2382 } else { |
| 2383 other = true; | 2383 other = true; |
| 2384 } | 2384 } |
| 2385 } | 2385 } |
| 2386 } | 2386 } |
| 2387 | 2387 |
| 2388 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); | 2388 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); |
| 2389 } | 2389 } |
| OLD | NEW |