| 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 2b335016103e3249da6db11bd06b7678623008e5..b34d90b8518cd379881a33ab9c5698927a05f982 100644
|
| --- a/chrome/browser/guest_view/guest_view_base.cc
|
| +++ b/chrome/browser/guest_view/guest_view_base.cc
|
| @@ -8,6 +8,7 @@
|
| #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"
|
| #include "chrome/browser/guest_view/guest_view_constants.h"
|
| #include "chrome/browser/guest_view/guest_view_manager.h"
|
| #include "chrome/browser/guest_view/web_view/web_view_guest.h"
|
| @@ -20,6 +21,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "extensions/browser/event_router.h"
|
| +#include "extensions/common/switches.h"
|
| #include "third_party/WebKit/public/web/WebInputEvent.h"
|
|
|
| using content::WebContents;
|
| @@ -135,6 +137,12 @@ GuestViewBase* GuestViewBase::Create(
|
| return NULL;
|
| }
|
| return new AppViewGuest(browser_context, guest_instance_id);
|
| + } else if (view_type == ExtensionOptionsGuest::Type) {
|
| + if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + extensions::switches::kEnableEmbeddedExtensionOptions)) {
|
| + return NULL;
|
| + }
|
| + return new ExtensionOptionsGuest(browser_context, guest_instance_id);
|
| }
|
| NOTREACHED();
|
| return NULL;
|
|
|