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

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

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed bug + latest master Created 8 years, 5 months 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
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/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
19 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h " 19 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h "
20 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h" 20 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h"
21 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h" 21 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h"
22 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" 22 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"
23 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" 23 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
24 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" 24 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"
25 #include "chrome/browser/extensions/extension_event_router.h" 25 #include "chrome/browser/extensions/event_router.h"
26 #include "chrome/browser/extensions/extension_info_map.h" 26 #include "chrome/browser/extensions/extension_info_map.h"
27 #include "chrome/browser/extensions/extension_prefs.h" 27 #include "chrome/browser/extensions/extension_prefs.h"
28 #include "chrome/browser/extensions/extension_service.h" 28 #include "chrome/browser/extensions/extension_service.h"
29 #include "chrome/browser/extensions/extension_tab_id_map.h" 29 #include "chrome/browser/extensions/extension_tab_id_map.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 32 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
33 #include "chrome/browser/renderer_host/web_cache_manager.h" 33 #include "chrome/browser/renderer_host/web_cache_manager.h"
34 #include "chrome/common/extensions/event_filtering_info.h"
34 #include "chrome/common/extensions/extension.h" 35 #include "chrome/common/extensions/extension.h"
35 #include "chrome/common/extensions/extension_constants.h" 36 #include "chrome/common/extensions/extension_constants.h"
36 #include "chrome/common/extensions/extension_error_utils.h" 37 #include "chrome/common/extensions/extension_error_utils.h"
37 #include "chrome/common/extensions/extension_messages.h" 38 #include "chrome/common/extensions/extension_messages.h"
38 #include "chrome/common/extensions/url_pattern.h" 39 #include "chrome/common/extensions/url_pattern.h"
39 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
40 #include "content/public/browser/browser_message_filter.h" 41 #include "content/public/browser/browser_message_filter.h"
41 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/render_process_host.h" 43 #include "content/public/browser/render_process_host.h"
43 #include "content/public/browser/resource_request_info.h" 44 #include "content/public/browser/resource_request_info.h"
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 scoped_ptr<ListValue> args_filtered(args.DeepCopy()); 924 scoped_ptr<ListValue> args_filtered(args.DeepCopy());
924 DictionaryValue* dict = NULL; 925 DictionaryValue* dict = NULL;
925 CHECK(args_filtered->GetDictionary(0, &dict) && dict); 926 CHECK(args_filtered->GetDictionary(0, &dict) && dict);
926 if (!((*it)->extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS)) 927 if (!((*it)->extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS))
927 dict->Remove(keys::kRequestHeadersKey, NULL); 928 dict->Remove(keys::kRequestHeadersKey, NULL);
928 if (!((*it)->extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS)) 929 if (!((*it)->extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS))
929 dict->Remove(keys::kResponseHeadersKey, NULL); 930 dict->Remove(keys::kResponseHeadersKey, NULL);
930 931
931 base::JSONWriter::Write(args_filtered.get(), &json_args); 932 base::JSONWriter::Write(args_filtered.get(), &json_args);
932 933
933 ExtensionEventRouter::DispatchEvent( 934 extensions::EventRouter::DispatchEvent(
934 (*it)->ipc_sender.get(), (*it)->extension_id, (*it)->sub_event_name, 935 (*it)->ipc_sender.get(), (*it)->extension_id, (*it)->sub_event_name,
935 json_args, GURL(), ExtensionEventRouter::USER_GESTURE_UNKNOWN, 936 json_args, GURL(), extensions::EventRouter::USER_GESTURE_UNKNOWN,
936 EventFilteringInfo()); 937 extensions::EventFilteringInfo());
937 if ((*it)->extra_info_spec & 938 if ((*it)->extra_info_spec &
938 (ExtraInfoSpec::BLOCKING | ExtraInfoSpec::ASYNC_BLOCKING)) { 939 (ExtraInfoSpec::BLOCKING | ExtraInfoSpec::ASYNC_BLOCKING)) {
939 (*it)->blocked_requests.insert(request->identifier()); 940 (*it)->blocked_requests.insert(request->identifier());
940 ++num_handlers_blocking; 941 ++num_handlers_blocking;
941 942
942 request->SetLoadStateParam( 943 request->SetLoadStateParam(
943 l10n_util::GetStringFUTF16(IDS_LOAD_STATE_PARAMETER_EXTENSION, 944 l10n_util::GetStringFUTF16(IDS_LOAD_STATE_PARAMETER_EXTENSION,
944 UTF8ToUTF16((*it)->extension_name))); 945 UTF8ToUTF16((*it)->extension_name)));
945 } 946 }
946 } 947 }
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1786 } else if ((*it)->name().find("AdBlock") != std::string::npos) { 1787 } else if ((*it)->name().find("AdBlock") != std::string::npos) {
1787 adblock = true; 1788 adblock = true;
1788 } else { 1789 } else {
1789 other = true; 1790 other = true;
1790 } 1791 }
1791 } 1792 }
1792 } 1793 }
1793 1794
1794 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); 1795 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
1795 } 1796 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698