Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api.cc

Issue 11572061: Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to Vaclav's CL and fix Dominic's comments Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/chrome_content_browser_client.h" 19 #include "chrome/browser/chrome_content_browser_client.h"
20 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h" 20 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
21 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h "
22 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h" 21 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h"
23 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h" 22 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h"
24 #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h" 23 #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h"
25 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" 24 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"
26 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" 25 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
27 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" 26 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"
28 #include "chrome/browser/extensions/event_router.h" 27 #include "chrome/browser/extensions/event_router.h"
29 #include "chrome/browser/extensions/extension_info_map.h" 28 #include "chrome/browser/extensions/extension_info_map.h"
30 #include "chrome/browser/extensions/extension_prefs.h" 29 #include "chrome/browser/extensions/extension_prefs.h"
31 #include "chrome/browser/extensions/extension_service.h" 30 #include "chrome/browser/extensions/extension_service.h"
(...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 base::Time start = base::Time::Now(); 1545 base::Time start = base::Time::Now();
1547 1546
1548 bool deltas_created = false; 1547 bool deltas_created = false;
1549 for (RelevantRegistries::iterator i = relevant_registries.begin(); 1548 for (RelevantRegistries::iterator i = relevant_registries.begin();
1550 i != relevant_registries.end(); ++i) { 1549 i != relevant_registries.end(); ++i) {
1551 extensions::WebRequestRulesRegistry* rules_registry = 1550 extensions::WebRequestRulesRegistry* rules_registry =
1552 i->first; 1551 i->first;
1553 helpers::EventResponseDeltas result = 1552 helpers::EventResponseDeltas result =
1554 rules_registry->CreateDeltas( 1553 rules_registry->CreateDeltas(
1555 extension_info_map, 1554 extension_info_map,
1556 extensions::WebRequestRule::RequestData( 1555 extensions::DeclarativeWebRequestData(
1557 request, request_stage, original_response_headers), 1556 request, request_stage, original_response_headers),
1558 i->second); 1557 i->second);
1559 1558
1560 if (!result.empty()) { 1559 if (!result.empty()) {
1561 helpers::EventResponseDeltas& deltas = 1560 helpers::EventResponseDeltas& deltas =
1562 blocked_requests_[request->identifier()].response_deltas; 1561 blocked_requests_[request->identifier()].response_deltas;
1563 deltas.insert(deltas.end(), result.begin(), result.end()); 1562 deltas.insert(deltas.end(), result.begin(), result.end());
1564 deltas_created = true; 1563 deltas_created = true;
1565 } 1564 }
1566 } 1565 }
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 } else if ((*it)->name().find("AdBlock") != std::string::npos) { 1912 } else if ((*it)->name().find("AdBlock") != std::string::npos) {
1914 adblock = true; 1913 adblock = true;
1915 } else { 1914 } else {
1916 other = true; 1915 other = true;
1917 } 1916 }
1918 } 1917 }
1919 } 1918 }
1920 1919
1921 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); 1920 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
1922 } 1921 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698