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

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

Issue 1632963002: webRequest: Check weak ptr before dispatching event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "extensions/browser/api/web_request/web_request_api.h" 5 #include "extensions/browser/api/web_request/web_request_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 event_listeners.find(target); 1065 event_listeners.find(target);
1066 // Ignore listener if it was removed between the thread hops. 1066 // Ignore listener if it was removed between the thread hops.
1067 if (listener == event_listeners.end()) { 1067 if (listener == event_listeners.end()) {
1068 if (!cross_event_listeners) 1068 if (!cross_event_listeners)
1069 continue; 1069 continue;
1070 listener = cross_event_listeners->find(target); 1070 listener = cross_event_listeners->find(target);
1071 if (listener == cross_event_listeners->end()) 1071 if (listener == cross_event_listeners->end())
1072 continue; 1072 continue;
1073 } 1073 }
1074 1074
1075 if (!listener->ipc_sender.get())
1076 continue;
1077
1075 // Filter out the optional keys that this listener didn't request. 1078 // Filter out the optional keys that this listener didn't request.
1076 scoped_ptr<base::ListValue> args_filtered(new base::ListValue); 1079 scoped_ptr<base::ListValue> args_filtered(new base::ListValue);
1077 args_filtered->Append( 1080 args_filtered->Append(
1078 event_details->GetFilteredDict(listener->extra_info_spec)); 1081 event_details->GetFilteredDict(listener->extra_info_spec));
1079 1082
1080 EventRouter::DispatchEventToSender( 1083 EventRouter::DispatchEventToSender(
1081 listener->ipc_sender.get(), browser_context, listener->extension_id, 1084 listener->ipc_sender.get(), browser_context, listener->extension_id,
1082 listener->histogram_value, listener->sub_event_name, 1085 listener->histogram_value, listener->sub_event_name,
1083 std::move(args_filtered), EventRouter::USER_GESTURE_UNKNOWN, 1086 std::move(args_filtered), EventRouter::USER_GESTURE_UNKNOWN,
1084 EventFilteringInfo()); 1087 EventFilteringInfo());
(...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 // Continue gracefully. 2258 // Continue gracefully.
2256 RunSync(); 2259 RunSync();
2257 } 2260 }
2258 2261
2259 bool WebRequestHandlerBehaviorChangedFunction::RunSync() { 2262 bool WebRequestHandlerBehaviorChangedFunction::RunSync() {
2260 helpers::ClearCacheOnNavigation(); 2263 helpers::ClearCacheOnNavigation();
2261 return true; 2264 return true;
2262 } 2265 }
2263 2266
2264 } // namespace extensions 2267 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698