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/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/guest_view/app_view/app_view_guest.h" | 9 #include "chrome/browser/guest_view/app_view/app_view_guest.h" |
10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" | 10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 return event.type == blink::WebGestureEvent::GesturePinchBegin || | 407 return event.type == blink::WebGestureEvent::GesturePinchBegin || |
408 event.type == blink::WebGestureEvent::GesturePinchUpdate || | 408 event.type == blink::WebGestureEvent::GesturePinchUpdate || |
409 event.type == blink::WebGestureEvent::GesturePinchEnd; | 409 event.type == blink::WebGestureEvent::GesturePinchEnd; |
410 } | 410 } |
411 | 411 |
412 GuestViewBase::~GuestViewBase() { | 412 GuestViewBase::~GuestViewBase() { |
413 } | 413 } |
414 | 414 |
415 void GuestViewBase::DispatchEventToEmbedder(Event* event) { | 415 void GuestViewBase::DispatchEventToEmbedder(Event* event) { |
416 scoped_ptr<Event> event_ptr(event); | 416 scoped_ptr<Event> event_ptr(event); |
417 if (!in_extension()) { | |
418 NOTREACHED(); | |
419 return; | |
420 } | |
421 | 417 |
422 if (!attached()) { | 418 if (!attached()) { |
423 pending_events_.push_back(linked_ptr<Event>(event_ptr.release())); | 419 pending_events_.push_back(linked_ptr<Event>(event_ptr.release())); |
424 return; | 420 return; |
425 } | 421 } |
426 | 422 |
427 extensions::EventFilteringInfo info; | 423 extensions::EventFilteringInfo info; |
428 info.SetInstanceID(view_instance_id_); | 424 info.SetInstanceID(view_instance_id_); |
429 scoped_ptr<base::ListValue> args(new base::ListValue()); | 425 scoped_ptr<base::ListValue> args(new base::ListValue()); |
430 args->Append(event->GetArguments().release()); | 426 args->Append(event->GetArguments().release()); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 guest_web_contents); | 461 guest_web_contents); |
466 callback.Run(guest_web_contents); | 462 callback.Run(guest_web_contents); |
467 } | 463 } |
468 | 464 |
469 // static | 465 // static |
470 void GuestViewBase::RegisterGuestViewTypes() { | 466 void GuestViewBase::RegisterGuestViewTypes() { |
471 AppViewGuest::Register(); | 467 AppViewGuest::Register(); |
472 ExtensionOptionsGuest::Register(); | 468 ExtensionOptionsGuest::Register(); |
473 WebViewGuest::Register(); | 469 WebViewGuest::Register(); |
474 } | 470 } |
OLD | NEW |