Implement support for <extensionoptions> embedding in WebUI

chrome/browser/guest_view/guest_view_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/guest_view/app_view/app_view_guest.h"
 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
@@ skipping 88 matching lines @@
 
 void GuestViewBase::Init(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
   if (initialized_)
     return;
   initialized_ = true;
 
-  if (!CanEmbedderUseGuestView(embedder_extension_id)) {
-    callback.Run(NULL);
-    return;
+  if (!embedder_extension_id.empty()) {
+    if (!CanEmbedderUseGuestView(embedder_extension_id)) {
+      callback.Run(NULL);
+      return;
+    }
   }
 
   CreateWebContents(embedder_extension_id,
                     embedder_render_process_id,
                     create_params,
                     base::Bind(&GuestViewBase::CompleteInit,
                                AsWeakPtr(),
                                embedder_extension_id,
                                embedder_render_process_id,
                                callback));
@@ skipping 260 matching lines @@
   return event.type == blink::WebGestureEvent::GesturePinchBegin ||
       event.type == blink::WebGestureEvent::GesturePinchUpdate ||
       event.type == blink::WebGestureEvent::GesturePinchEnd;
 }
 
 GuestViewBase::~GuestViewBase() {
 }
 
 void GuestViewBase::DispatchEventToEmbedder(Event* event) {
   scoped_ptr<Event> event_ptr(event);
-  if (!in_extension()) {
-    NOTREACHED();
-    return;
-  }
 
   if (!attached()) {
     pending_events_.push_back(linked_ptr<Event>(event_ptr.release()));
     return;
   }
 
   extensions::EventFilteringInfo info;
   info.SetInstanceID(view_instance_id_);
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(event->GetArguments().release());
@@ skipping 34 matching lines @@
                       guest_web_contents);
   callback.Run(guest_web_contents);
 }
 
 // static
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   WebViewGuest::Register();
 }