Index: chrome/browser/guest_view/guest_view_base.cc |
diff --git a/chrome/browser/guest_view/guest_view_base.cc b/chrome/browser/guest_view/guest_view_base.cc |
index 1300cfbb50d4b30240729963b6c2ff87dfcf8b4a..0c0480fa7fad2babc06ba90cefc24b832a30878f 100644 |
--- a/chrome/browser/guest_view/guest_view_base.cc |
+++ b/chrome/browser/guest_view/guest_view_base.cc |
@@ -106,9 +106,11 @@ void GuestViewBase::Init( |
return; |
initialized_ = true; |
- if (!CanEmbedderUseGuestView(embedder_extension_id)) { |
- callback.Run(NULL); |
- return; |
+ if (!embedder_extension_id.empty()) { |
not at google - send to devlin
2014/08/07 23:06:02
this should also be unnecessary
ericzeng
2014/08/08 00:23:46
I'll leave it in until your patch lands.
not at google - send to devlin
2014/08/08 14:08:15
stay tuned!
|
+ if (!CanEmbedderUseGuestView(embedder_extension_id)) { |
+ callback.Run(NULL); |
+ return; |
+ } |
} |
CreateWebContents(embedder_extension_id, |
@@ -389,10 +391,6 @@ GuestViewBase::~GuestViewBase() { |
void GuestViewBase::DispatchEventToEmbedder(Event* event) { |
scoped_ptr<Event> event_ptr(event); |
- if (!in_extension()) { |
- NOTREACHED(); |
- return; |
- } |
not at google - send to devlin
2014/08/07 23:06:02
but you'll still need this. it's not an important
Fady Samuel
2014/08/07 23:09:29
Will the event router work in WebUI? Will WebUI re
not at google - send to devlin
2014/08/07 23:13:54
yes, this is one of the things I made work.
howev
ericzeng
2014/08/08 00:23:46
What do you mean by I'll still need it? Won't it c
not at google - send to devlin
2014/08/08 14:08:15
I meant you'll still need to make this change :) b
|
if (!attached()) { |
pending_events_.push_back(linked_ptr<Event>(event_ptr.release())); |