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 "chrome/browser/guest_view/guest_view_base.h" | 5 #include "chrome/browser/guest_view/guest_view_base.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/guest_view/app_view/app_view_guest.h" | 10 #include "chrome/browser/guest_view/app_view/app_view_guest.h" |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); | 295 std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_); |
296 | 296 |
297 webcontents_guestview_map.Get().erase(guest_web_contents()); | 297 webcontents_guestview_map.Get().erase(guest_web_contents()); |
298 | 298 |
299 GuestViewManager::FromBrowserContext(browser_context_)-> | 299 GuestViewManager::FromBrowserContext(browser_context_)-> |
300 RemoveGuest(guest_instance_id_); | 300 RemoveGuest(guest_instance_id_); |
301 | 301 |
302 pending_events_.clear(); | 302 pending_events_.clear(); |
303 } | 303 } |
304 | 304 |
305 void GuestViewBase::DispatchEvent(Event* event) { | 305 void GuestViewBase::DispatchEventToEmbedder(Event* event) { |
306 scoped_ptr<Event> event_ptr(event); | 306 scoped_ptr<Event> event_ptr(event); |
307 if (!in_extension()) { | 307 if (!in_extension()) { |
308 NOTREACHED(); | 308 NOTREACHED(); |
309 return; | 309 return; |
310 } | 310 } |
311 | 311 |
312 if (!attached()) { | 312 if (!attached()) { |
313 pending_events_.push_back(linked_ptr<Event>(event_ptr.release())); | 313 pending_events_.push_back(linked_ptr<Event>(event_ptr.release())); |
314 return; | 314 return; |
315 } | 315 } |
(...skipping 14 matching lines...) Expand all Loading... |
330 extensions::EventRouter::USER_GESTURE_UNKNOWN, | 330 extensions::EventRouter::USER_GESTURE_UNKNOWN, |
331 info); | 331 info); |
332 } | 332 } |
333 | 333 |
334 void GuestViewBase::SendQueuedEvents() { | 334 void GuestViewBase::SendQueuedEvents() { |
335 if (!attached()) | 335 if (!attached()) |
336 return; | 336 return; |
337 while (!pending_events_.empty()) { | 337 while (!pending_events_.empty()) { |
338 linked_ptr<Event> event_ptr = pending_events_.front(); | 338 linked_ptr<Event> event_ptr = pending_events_.front(); |
339 pending_events_.pop_front(); | 339 pending_events_.pop_front(); |
340 DispatchEvent(event_ptr.release()); | 340 DispatchEventToEmbedder(event_ptr.release()); |
341 } | 341 } |
342 } | 342 } |
343 | 343 |
344 void GuestViewBase::CompleteCreateWebContents( | 344 void GuestViewBase::CompleteCreateWebContents( |
345 const std::string& embedder_extension_id, | 345 const std::string& embedder_extension_id, |
346 int embedder_render_process_id, | 346 int embedder_render_process_id, |
347 const WebContentsCreatedCallback& callback, | 347 const WebContentsCreatedCallback& callback, |
348 content::WebContents* guest_web_contents) { | 348 content::WebContents* guest_web_contents) { |
349 if (!guest_web_contents) { | 349 if (!guest_web_contents) { |
350 callback.Run(NULL); | 350 callback.Run(NULL); |
351 return; | 351 return; |
352 } | 352 } |
353 InitWithWebContents(embedder_extension_id, | 353 InitWithWebContents(embedder_extension_id, |
354 embedder_render_process_id, | 354 embedder_render_process_id, |
355 guest_web_contents); | 355 guest_web_contents); |
356 callback.Run(guest_web_contents); | 356 callback.Run(guest_web_contents); |
357 } | 357 } |
OLD | NEW |