chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc - Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag

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: chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.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

« chrome/browser/guest_view/extension_options/extension_options_guest.cc ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/resources/extensions/extension_options.js » ('j') | chrome/test/data/extensions/api_test/extension_options/embed_self/manifest.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

index eaf3db0f3a42329bef713d6583a24a8a31004acb..ec39c5caddb81c8a5ffaebe1787ec453baa54e58 100644

--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

@@ -30,6 +30,7 @@

#include "content/public/renderer/render_thread.h"

#include "content/public/renderer/render_view.h"

#include "extensions/common/extension.h"

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

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

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

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

@@ -238,6 +239,7 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(

// Platform app sources that are not API-specific..

source_map->RegisterSource("appView", IDR_APP_VIEW_JS);

+ source_map->RegisterSource("extensionOptions", IDR_EXTENSION_OPTIONS_JS);

source_map->RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);

source_map->RegisterSource("webViewInternal",

IDR_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS);

@@ -311,6 +313,13 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(

module_system->Require("denyAppView");

}

+ if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT &&

+ extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() &&

+ extension->permissions_data()->HasAPIPermission(

+ extensions::APIPermission::kEmbeddedExtensionOptions)) {

+ module_system->Require("extensionOptions");

+ }

}

void ChromeExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(