| 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/renderer/extensions/request_sender.h" | 5 #include "chrome/renderer/extensions/request_sender.h" |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "chrome/common/extensions/extension_messages.h" | 8 #include "chrome/common/extensions/extension_messages.h" |
| 9 #include "chrome/renderer/extensions/chrome_v8_context.h" | 9 #include "chrome/renderer/extensions/chrome_v8_context.h" |
| 10 #include "chrome/renderer/extensions/dispatcher.h" | 10 #include "chrome/renderer/extensions/dispatcher.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 NOTREACHED() << "Unexpected function " << name << | 73 NOTREACHED() << "Unexpected function " << name << |
| 74 ". Did you remember to register it with ExtensionFunctionRegistry?"; | 74 ". Did you remember to register it with ExtensionFunctionRegistry?"; |
| 75 return; | 75 return; |
| 76 } | 76 } |
| 77 | 77 |
| 78 // TODO(koz): See if we can make this a CHECK. | 78 // TODO(koz): See if we can make this a CHECK. |
| 79 if (!dispatcher_->CheckContextAccessToExtensionAPI(name, context)) | 79 if (!dispatcher_->CheckContextAccessToExtensionAPI(name, context)) |
| 80 return; | 80 return; |
| 81 | 81 |
| 82 GURL source_url; | 82 GURL source_url; |
| 83 if (WebKit::WebFrame* webframe = context->web_frame()) | 83 if (blink::WebFrame* webframe = context->web_frame()) |
| 84 source_url = webframe->document().url(); | 84 source_url = webframe->document().url(); |
| 85 | 85 |
| 86 InsertRequest(request_id, new PendingRequest(name, source)); | 86 InsertRequest(request_id, new PendingRequest(name, source)); |
| 87 | 87 |
| 88 ExtensionHostMsg_Request_Params params; | 88 ExtensionHostMsg_Request_Params params; |
| 89 params.name = name; | 89 params.name = name; |
| 90 params.arguments.Swap(value_args); | 90 params.arguments.Swap(value_args); |
| 91 params.extension_id = context->GetExtensionID(); | 91 params.extension_id = context->GetExtensionID(); |
| 92 params.source_url = source_url; | 92 params.source_url = source_url; |
| 93 params.request_id = request_id; | 93 params.request_id = request_id; |
| 94 params.has_callback = has_callback; | 94 params.has_callback = has_callback; |
| 95 params.user_gesture = | 95 params.user_gesture = |
| 96 WebKit::WebUserGestureIndicator::isProcessingUserGesture(); | 96 blink::WebUserGestureIndicator::isProcessingUserGesture(); |
| 97 if (for_io_thread) { | 97 if (for_io_thread) { |
| 98 renderview->Send(new ExtensionHostMsg_RequestForIOThread( | 98 renderview->Send(new ExtensionHostMsg_RequestForIOThread( |
| 99 renderview->GetRoutingID(), params)); | 99 renderview->GetRoutingID(), params)); |
| 100 } else { | 100 } else { |
| 101 renderview->Send(new ExtensionHostMsg_Request( | 101 renderview->Send(new ExtensionHostMsg_Request( |
| 102 renderview->GetRoutingID(), params)); | 102 renderview->GetRoutingID(), params)); |
| 103 } | 103 } |
| 104 } | 104 } |
| 105 | 105 |
| 106 void RequestSender::HandleResponse(int request_id, | 106 void RequestSender::HandleResponse(int request_id, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 122 for (PendingRequestMap::iterator it = pending_requests_.begin(); | 122 for (PendingRequestMap::iterator it = pending_requests_.begin(); |
| 123 it != pending_requests_.end();) { | 123 it != pending_requests_.end();) { |
| 124 if (it->second->source == source) | 124 if (it->second->source == source) |
| 125 pending_requests_.erase(it++); | 125 pending_requests_.erase(it++); |
| 126 else | 126 else |
| 127 ++it; | 127 ++it; |
| 128 } | 128 } |
| 129 } | 129 } |
| 130 | 130 |
| 131 } // namespace extensions | 131 } // namespace extensions |
| OLD | NEW |