extensions/browser/guest_view/extension_options/extension_options_guest.cc - Issue 667453003: First stage of launch for embedded options pages. With this patch, extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/guest_view/extension_options/extension_options_guest.cc

Issue 667453003: First stage of launch for embedded options pages. With this patch, extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Created 6 years, 2 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

« no previous file with comments | « extensions/browser/guest_view/extension_options/extension_options_apitest.cc ('k') | extensions/common/manifest_handlers/options_page_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc

diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

index ef79ee704918a5a009fff7995a441d0950e0be8f..83296fc63da9dd5885e0be4cee341ef612f347e4 100644

--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc

+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

@@ -20,7 +20,6 @@

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_messages.h"

-#include "extensions/common/feature_switch.h"

#include "extensions/common/manifest_handlers/options_page_info.h"

#include "extensions/common/permissions/permissions_data.h"

#include "extensions/strings/grit/extensions_strings.h"

@@ -51,9 +50,6 @@ ExtensionOptionsGuest::~ExtensionOptionsGuest() {

extensions::GuestViewBase* ExtensionOptionsGuest::Create(

content::BrowserContext* browser_context,

int guest_instance_id) {

- if (!extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {

- return NULL;

- }

return new ExtensionOptionsGuest(browser_context, guest_instance_id);

}