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

Unified Diff: chrome/browser/extensions/api/declarative/declarative_api.cc

Issue 28273006: <webview>: Implement declarativeWebRequest API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits Created 7 years, 1 month 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/extensions/api/declarative/declarative_api.cc
diff --git a/chrome/browser/extensions/api/declarative/declarative_api.cc b/chrome/browser/extensions/api/declarative/declarative_api.cc
index f0bd305df18ff0375d904f4994072d6a5d5744d6..6f3ec1224e6a88f180881a2d100ee02b09a4adee 100644
--- a/chrome/browser/extensions/api/declarative/declarative_api.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_api.cc
@@ -10,9 +10,12 @@
#include "base/values.h"
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
#include "chrome/browser/extensions/extension_system_factory.h"
+#include "chrome/browser/guestview/webview/webview_guest.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/events.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
#include "extensions/common/extension_api.h"
using extensions::api::events::Rule;
@@ -21,15 +24,43 @@ namespace AddRules = extensions::api::events::Event::AddRules;
namespace GetRules = extensions::api::events::Event::GetRules;
namespace RemoveRules = extensions::api::events::Event::RemoveRules;
+
namespace extensions {
-RulesFunction::RulesFunction() : rules_registry_(NULL) {}
+namespace {
+
+const char kWebRequest[] = "declarativeWebRequest.";
+const char kWebView[] = "webview.";
+const char kWebViewExpectedError[] = "Webview event with Webview ID expected.";
+
+bool IsWebViewEvent(const std::string& event_name) {
+ // Sample event names:
+ // webview.onRequest.
+ // webview.OnMessage.
+ return event_name.compare(0, strlen(kWebView), kWebView) == 0;
+}
+
+std::string GetWebRequestEventName(const std::string& event_name) {
+ std::string web_request_event_name(event_name);
+ if (IsWebViewEvent(web_request_event_name))
+ web_request_event_name.replace(0, strlen(kWebView), kWebRequest);
+ return web_request_event_name;
+}
+
+} // namespace
+
+RulesFunction::RulesFunction()
+ : rules_registry_(NULL) {
+}
RulesFunction::~RulesFunction() {}
bool RulesFunction::HasPermission() {
std::string event_name;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name));
+ if (IsWebViewEvent(event_name) &&
+ extension_->HasAPIPermission(extensions::APIPermission::kWebView))
+ return true;
Feature::Availability availability =
ExtensionAPI::GetSharedInstance()->IsAvailable(
event_name, extension_, Feature::BLESSED_EXTENSION_CONTEXT,
@@ -41,9 +72,22 @@ bool RulesFunction::RunImpl() {
std::string event_name;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name));
+ int webview_instance_id = 0;
+ EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &webview_instance_id));
+ int embedder_process_id = render_view_host()->GetProcess()->GetID();
+
+ bool has_webview = webview_instance_id != 0;
+ if (has_webview != IsWebViewEvent(event_name))
+ EXTENSION_FUNCTION_ERROR(kWebViewExpectedError);
+ event_name = GetWebRequestEventName(event_name);
+
+ // If we are not operating on a particular <webview>, then the key is (0, 0).
+ RulesRegistryService::WebViewKey key(
+ webview_instance_id ? embedder_process_id : 0, webview_instance_id);
+
RulesRegistryService* rules_registry_service =
RulesRegistryService::Get(GetProfile());
- rules_registry_ = rules_registry_service->GetRulesRegistry(event_name);
+ rules_registry_ = rules_registry_service->GetRulesRegistry(key, event_name);
// Raw access to this function is not available to extensions, therefore
// there should never be a request for a nonexisting rules registry.
EXTENSION_FUNCTION_VALIDATE(rules_registry_.get());

Powered by Google App Engine
This is Rietveld 408576698