OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/wake_event_page.h" | 5 #include "extensions/renderer/wake_event_page.h" |
6 | 6 |
| 7 #include <memory> |
7 #include <utility> | 8 #include <utility> |
8 | 9 |
9 #include "base/atomic_sequence_num.h" | 10 #include "base/atomic_sequence_num.h" |
10 #include "base/bind.h" | 11 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
12 #include "base/lazy_instance.h" | 13 #include "base/lazy_instance.h" |
13 #include "base/logging.h" | 14 #include "base/logging.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "content/public/child/worker_thread.h" | 16 #include "content/public/child/worker_thread.h" |
17 #include "content/public/renderer/render_thread.h" | 17 #include "content/public/renderer/render_thread.h" |
18 #include "extensions/common/extension_messages.h" | 18 #include "extensions/common/extension_messages.h" |
19 #include "extensions/renderer/object_backed_native_handler.h" | 19 #include "extensions/renderer/object_backed_native_handler.h" |
20 #include "extensions/renderer/script_context.h" | 20 #include "extensions/renderer/script_context.h" |
21 #include "extensions/renderer/v8_helpers.h" | 21 #include "extensions/renderer/v8_helpers.h" |
22 #include "ipc/ipc_message.h" | 22 #include "ipc/ipc_message.h" |
23 #include "ipc/ipc_message_macros.h" | 23 #include "ipc/ipc_message_macros.h" |
24 | 24 |
25 namespace extensions { | 25 namespace extensions { |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 | 153 |
154 WakeEventPage::WakeEventPage() {} | 154 WakeEventPage::WakeEventPage() {} |
155 | 155 |
156 WakeEventPage::~WakeEventPage() {} | 156 WakeEventPage::~WakeEventPage() {} |
157 | 157 |
158 void WakeEventPage::MakeRequest(const std::string& extension_id, | 158 void WakeEventPage::MakeRequest(const std::string& extension_id, |
159 const OnResponseCallback& on_response) { | 159 const OnResponseCallback& on_response) { |
160 static base::AtomicSequenceNumber sequence_number; | 160 static base::AtomicSequenceNumber sequence_number; |
161 int request_id = sequence_number.GetNext(); | 161 int request_id = sequence_number.GetNext(); |
162 { | 162 { |
163 scoped_ptr<RequestData> request_data( | 163 std::unique_ptr<RequestData> request_data( |
164 new RequestData(content::WorkerThread::GetCurrentId(), on_response)); | 164 new RequestData(content::WorkerThread::GetCurrentId(), on_response)); |
165 base::AutoLock lock(requests_lock_); | 165 base::AutoLock lock(requests_lock_); |
166 requests_.set(request_id, std::move(request_data)); | 166 requests_.set(request_id, std::move(request_data)); |
167 } | 167 } |
168 message_filter_->Send( | 168 message_filter_->Send( |
169 new ExtensionHostMsg_WakeEventPage(request_id, extension_id)); | 169 new ExtensionHostMsg_WakeEventPage(request_id, extension_id)); |
170 } | 170 } |
171 | 171 |
172 bool WakeEventPage::OnControlMessageReceived(const IPC::Message& message) { | 172 bool WakeEventPage::OnControlMessageReceived(const IPC::Message& message) { |
173 bool handled = true; | 173 bool handled = true; |
174 IPC_BEGIN_MESSAGE_MAP(WakeEventPage, message) | 174 IPC_BEGIN_MESSAGE_MAP(WakeEventPage, message) |
175 IPC_MESSAGE_HANDLER(ExtensionMsg_WakeEventPageResponse, | 175 IPC_MESSAGE_HANDLER(ExtensionMsg_WakeEventPageResponse, |
176 OnWakeEventPageResponse) | 176 OnWakeEventPageResponse) |
177 IPC_MESSAGE_UNHANDLED(handled = false) | 177 IPC_MESSAGE_UNHANDLED(handled = false) |
178 IPC_END_MESSAGE_MAP() | 178 IPC_END_MESSAGE_MAP() |
179 return handled; | 179 return handled; |
180 } | 180 } |
181 | 181 |
182 void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) { | 182 void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) { |
183 scoped_ptr<RequestData> request_data; | 183 std::unique_ptr<RequestData> request_data; |
184 { | 184 { |
185 base::AutoLock lock(requests_lock_); | 185 base::AutoLock lock(requests_lock_); |
186 request_data = requests_.take(request_id); | 186 request_data = requests_.take(request_id); |
187 } | 187 } |
188 CHECK(request_data) << "No request with ID " << request_id; | 188 CHECK(request_data) << "No request with ID " << request_id; |
189 if (request_data->thread_id == 0) { | 189 if (request_data->thread_id == 0) { |
190 // Thread ID of 0 means it wasn't called on a worker thread, so safe to | 190 // Thread ID of 0 means it wasn't called on a worker thread, so safe to |
191 // call immediately. | 191 // call immediately. |
192 request_data->on_response.Run(success); | 192 request_data->on_response.Run(success); |
193 } else { | 193 } else { |
194 content::WorkerThread::PostTask( | 194 content::WorkerThread::PostTask( |
195 request_data->thread_id, | 195 request_data->thread_id, |
196 base::Bind(request_data->on_response, success)); | 196 base::Bind(request_data->on_response, success)); |
197 } | 197 } |
198 } | 198 } |
199 | 199 |
200 } // namespace extensions | 200 } // namespace extensions |
OLD | NEW |