Implement support for <extensionoptions> embedding in WebUI

chrome/browser/extensions/api/guest_view/guest_view_internal_api.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/extensions/api/guest_view/guest_view_internal_api.h"
 
 #include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/guest_view_internal.h"
@@ skipping 15 matching lines @@
 
   base::DictionaryValue* create_params;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));
 
   GuestViewManager* guest_view_manager =
       GuestViewManager::FromBrowserContext(browser_context());
 
   GuestViewManager::WebContentsCreatedCallback callback =
       base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback,
                  this);
+
+  // If this the guest is an <extensionoptions> to be embedded in a WebUI, then

[Lei Zhang, 2014/08/12 20:00:46]

"if this the guest is ..." <- did you mean "If the guest is ... " ?

[ericzeng, 2014/08/12 22:07:17]

Done.

+  // there is no extension, and extension() will be null. Use an empty string
+  // instead.
+  std::string embedder_extension_id;
+  if (extension())
+    embedder_extension_id = extension_id();
+
   guest_view_manager->CreateGuest(view_type,
-                                  extension_id(),
+                                  embedder_extension_id,
                                   GetAssociatedWebContents(),
                                   *create_params,
                                   callback);
 
   return true;
 }
 
 void GuestViewInternalCreateGuestFunction::CreateGuestCallback(
     content::WebContents* guest_web_contents) {
   int guest_instance_id = 0;
@@ skipping 24 matching lines @@
   guest->SetAutoSize(params->params.enable_auto_size,
                      gfx::Size(params->params.min.width,
                                params->params.min.height),
                      gfx::Size(params->params.max.width,
                                params->params.max.height));
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions