OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/renderer/request_sender.h" | 5 #include "extensions/renderer/request_sender.h" |
6 | 6 |
7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
8 #include "base/timer/elapsed_timer.h" | 8 #include "base/timer/elapsed_timer.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "content/public/renderer/render_frame.h" | 10 #include "content/public/renderer/render_frame.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 blink::WebUserGestureIndicator::currentUserGestureToken())); | 95 blink::WebUserGestureIndicator::currentUserGestureToken())); |
96 | 96 |
97 ExtensionHostMsg_Request_Params params; | 97 ExtensionHostMsg_Request_Params params; |
98 params.name = name; | 98 params.name = name; |
99 params.arguments.Swap(value_args); | 99 params.arguments.Swap(value_args); |
100 params.extension_id = context->GetExtensionID(); | 100 params.extension_id = context->GetExtensionID(); |
101 params.source_url = source_url; | 101 params.source_url = source_url; |
102 params.request_id = request_id; | 102 params.request_id = request_id; |
103 params.has_callback = has_callback; | 103 params.has_callback = has_callback; |
104 params.user_gesture = | 104 params.user_gesture = |
105 blink::WebUserGestureIndicator::isProcessingUserGesture(); | 105 blink::WebUserGestureIndicator::isProcessingUserGestureThreadSafe(); |
106 | 106 |
107 // Set Service Worker specific params to default values. | 107 // Set Service Worker specific params to default values. |
108 params.worker_thread_id = -1; | 108 params.worker_thread_id = -1; |
109 params.service_worker_version_id = kInvalidServiceWorkerVersionId; | 109 params.service_worker_version_id = kInvalidServiceWorkerVersionId; |
110 | 110 |
111 SendRequest(render_frame, for_io_thread, params); | 111 SendRequest(render_frame, for_io_thread, params); |
112 return true; | 112 return true; |
113 } | 113 } |
114 | 114 |
115 void RequestSender::SendRequest(content::RenderFrame* render_frame, | 115 void RequestSender::SendRequest(content::RenderFrame* render_frame, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 for (PendingRequestMap::iterator it = pending_requests_.begin(); | 149 for (PendingRequestMap::iterator it = pending_requests_.begin(); |
150 it != pending_requests_.end();) { | 150 it != pending_requests_.end();) { |
151 if (it->second->source == source) | 151 if (it->second->source == source) |
152 pending_requests_.erase(it++); | 152 pending_requests_.erase(it++); |
153 else | 153 else |
154 ++it; | 154 ++it; |
155 } | 155 } |
156 } | 156 } |
157 | 157 |
158 } // namespace extensions | 158 } // namespace extensions |
OLD | NEW |