Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5600)

Unified Diff: chrome/browser/guest_view/guest_view_base.cc

Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address kalman's comments, add new test for privileged extension apis Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f2a0a9b13459f947b937a1fb1f3da7dffefee597..8342e60570f0ed61451fa79b72a1a2ffc4927ea4 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"
@@ -19,6 +20,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
#include "extensions/browser/event_router.h"
+#include "extensions/common/feature_switch.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
using content::WebContents;
@@ -144,6 +146,8 @@ GuestViewBase* GuestViewBase::Create(
content::BrowserContext* browser_context,
int guest_instance_id,
const std::string& view_type) {
+ // TODO(fsamuel): All these string comparisons are a little inefficient. Maybe
+ // we want a registry of GuestView types in the future.
if (view_type == WebViewGuest::Type) {
return new WebViewGuest(browser_context, guest_instance_id);
} else if (view_type == AppViewGuest::Type) {
@@ -152,6 +156,11 @@ GuestViewBase* GuestViewBase::Create(
return NULL;
}
return new AppViewGuest(browser_context, guest_instance_id);
+ } else if (view_type == ExtensionOptionsGuest::Type) {
+ if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {
+ return NULL;
+ }
+ return new ExtensionOptionsGuest(browser_context, guest_instance_id);
}
NOTREACHED();
return NULL;

Powered by Google App Engine
This is Rietveld 408576698