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 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1637 } | 1637 } |
1638 #endif | 1638 #endif |
1639 | 1639 |
1640 base::Time start = base::Time::Now(); | 1640 base::Time start = base::Time::Now(); |
1641 | 1641 |
1642 bool deltas_created = false; | 1642 bool deltas_created = false; |
1643 for (RelevantRegistries::iterator i = relevant_registries.begin(); | 1643 for (RelevantRegistries::iterator i = relevant_registries.begin(); |
1644 i != relevant_registries.end(); ++i) { | 1644 i != relevant_registries.end(); ++i) { |
1645 extensions::WebRequestRulesRegistry* rules_registry = | 1645 extensions::WebRequestRulesRegistry* rules_registry = |
1646 i->first; | 1646 i->first; |
| 1647 extensions::DeclarativeWebRequestData request_data( |
| 1648 request, request_stage, original_response_headers); |
1647 helpers::EventResponseDeltas result = | 1649 helpers::EventResponseDeltas result = |
1648 rules_registry->CreateDeltas( | 1650 rules_registry->CreateDeltas( |
1649 extension_info_map, | 1651 extension_info_map, &request_data, i->second); |
1650 extensions::DeclarativeWebRequestData( | |
1651 request, request_stage, original_response_headers), | |
1652 i->second); | |
1653 | 1652 |
1654 if (!result.empty()) { | 1653 if (!result.empty()) { |
1655 helpers::EventResponseDeltas& deltas = | 1654 helpers::EventResponseDeltas& deltas = |
1656 blocked_requests_[request->identifier()].response_deltas; | 1655 blocked_requests_[request->identifier()].response_deltas; |
1657 deltas.insert(deltas.end(), result.begin(), result.end()); | 1656 deltas.insert(deltas.end(), result.begin(), result.end()); |
1658 deltas_created = true; | 1657 deltas_created = true; |
1659 } | 1658 } |
1660 } | 1659 } |
1661 | 1660 |
1662 base::TimeDelta elapsed_time = start - base::Time::Now(); | 1661 base::TimeDelta elapsed_time = start - base::Time::Now(); |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2007 } else if ((*it)->name().find("AdBlock") != std::string::npos) { | 2006 } else if ((*it)->name().find("AdBlock") != std::string::npos) { |
2008 adblock = true; | 2007 adblock = true; |
2009 } else { | 2008 } else { |
2010 other = true; | 2009 other = true; |
2011 } | 2010 } |
2012 } | 2011 } |
2013 } | 2012 } |
2014 | 2013 |
2015 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); | 2014 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); |
2016 } | 2015 } |
OLD | NEW |