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

Unified Diff: extensions/browser/api/guest_view/web_view/web_view_internal_api.cc

Issue 1004253002: Enable <webview>.executeScript outside of Apps and Extensions [2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up. Created 5 years, 9 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: extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
index c55733559faf6d05473f668707230c2e577cd733..ecd877747adc56a7ee7e13a8bd03ebf791f21acc 100644
--- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
@@ -6,17 +6,23 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/stop_find_action.h"
+#include "content/public/common/url_fetcher.h"
#include "extensions/common/api/web_view_internal.h"
+#include "net/base/load_flags.h"
+#include "net/url_request/url_fetcher.h"
+#include "net/url_request/url_fetcher_delegate.h"
#include "third_party/WebKit/public/web/WebFindOptions.h"
using content::WebContents;
using extensions::core_api::web_view_internal::SetPermission::Params;
using extensions::core_api::extension_types::InjectDetails;
+using net::URLFetcher;
namespace webview = extensions::core_api::web_view_internal;
namespace {
@@ -49,6 +55,64 @@ int MaskForKey(const char* key) {
namespace extensions {
+// WebUIURLFetcher downloads the content of a file by giving its |url| on WebUI.
+// Each WebUIURLFetcher is associated with a given |render_process_id,
+// render_view_id| pair.
+class WebViewInternalExecuteCodeFunction::WebUIURLFetcher
+ : public net::URLFetcherDelegate {
+ public:
+ WebUIURLFetcher(scoped_refptr<WebViewInternalExecuteCodeFunction> function,
+ const GURL& url,
+ int render_process_id,
+ int render_view_id,
+ const ExecuteCodeFunction::WebUILoadFileCallback& callback)
+ : function_(function),
+ url_(url),
+ render_process_id_(render_process_id),
+ render_view_id_(render_view_id),
+ callback_(callback) {}
+ ~WebUIURLFetcher() override {}
+
+ void Start() {
+ fetcher_.reset(URLFetcher::Create(url_, URLFetcher::GET, this));
+ fetcher_->SetRequestContext(
+ function_->browser_context()->GetRequestContext());
+ fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
+
+ content::AssociateURLFetcherWithRenderFrame(
+ fetcher_.get(), url_, render_process_id_, render_view_id_);
+ fetcher_->Start();
+ }
+
+ private:
+ // net::URLFetcherDelegate:
+ void OnURLFetchComplete(const URLFetcher* source) override {
+ CHECK_EQ(fetcher_.get(), source);
+ scoped_ptr<net::URLFetcher> fetcher(fetcher_.Pass());
+
+ std::string data;
+ if (fetcher->GetStatus().status() != net::URLRequestStatus::SUCCESS ||
+ fetcher->GetResponseCode() != 200) {
+ function_->OnWebUIURLFetchComplete(this);
+ callback_.Run(false, data);
+ return;
+ }
+
+ bool result = fetcher->GetResponseAsString(&data);
+ DCHECK(result) << "Invalid fetcher setting.";
+ callback_.Run(true, data);
+ }
+
+ scoped_refptr<WebViewInternalExecuteCodeFunction> function_;
+ GURL url_;
+ const int render_process_id_;
+ const int render_view_id_;
+ const ExecuteCodeFunction::WebUILoadFileCallback callback_;
+ scoped_ptr<URLFetcher> fetcher_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebUIURLFetcher);
+};
+
bool WebViewInternalExtensionFunction::RunAsync() {
int instance_id = 0;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &instance_id));
@@ -145,6 +209,33 @@ const GURL& WebViewInternalExecuteCodeFunction::GetWebViewSrc() const {
return guest_src_;
}
+bool WebViewInternalExecuteCodeFunction::LoadFileForWebUI(
+ const std::string& file_src,
+ const WebUILoadFileCallback& callback) {
+ if (!render_view_host() || !render_view_host()->GetProcess())
+ return false;
+ WebViewGuest* guest = WebViewGuest::From(
+ render_view_host()->GetProcess()->GetID(), guest_instance_id_);
+ if (!guest || host_id().type() != HostID::WEBUI)
+ return false;
+
+ GURL owner_base_url(guest->GetOwnerSiteURL().GetWithEmptyPath());
+ GURL file_url(owner_base_url.Resolve(file_src));
+
+ scoped_ptr<WebUIURLFetcher> fetcher(
+ new WebUIURLFetcher(make_scoped_refptr(this), file_url,
+ render_view_host()->GetProcess()->GetID(),
+ render_view_host()->GetRoutingID(), callback));
+ fetcher->Start();
+ fetchers_.push_back(fetcher.release()); // Pass ownership to |fetchers|.
+ return true;
+}
+
+void WebViewInternalExecuteCodeFunction::OnWebUIURLFetchComplete(
+ const WebUIURLFetcher* fetcher) {
+ fetchers_.erase(std::find(fetchers_.begin(), fetchers_.end(), fetcher));
+}
+
WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() {
}

Powered by Google App Engine
This is Rietveld 408576698