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

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: Remove WIP test 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/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..fc98ce7796d2000b45edfb545bd7e38c4d82bde0 100644
--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
@@ -30,10 +30,12 @@
#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"
#include "extensions/common/permissions/permissions_data.h"
+#include "extensions/common/switches.h"
Devlin 2014/07/16 20:55:07 don't need this.
ericzeng 2014/07/16 22:27:38 Done.
#include "extensions/common/url_pattern_set.h"
#include "extensions/renderer/dispatcher.h"
#include "extensions/renderer/native_handler.h"
@@ -238,6 +240,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 +314,14 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(
module_system->Require("denyAppView");
}
}
+
+ if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT) {
Devlin 2014/07/16 20:55:07 now that there are no ors, this is perfectly reada
ericzeng 2014/07/16 22:27:38 Done.
+ if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() &&
+ extension->permissions_data()->HasAPIPermission(
+ extensions::APIPermission::kEmbeddedExtensionOptions)) {
+ module_system->Require("extensionOptions");
+ }
+ }
}
void ChromeExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(

Powered by Google App Engine
This is Rietveld 408576698