| 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..7271f64c79f13236f97fe29819590a25fcafd8ec 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(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, false, data);
|
| + callback_.Run(false, data);
|
| + return;
|
| + }
|
| +
|
| + bool result = fetcher->GetResponseAsString(&data);
|
| + DCHECK(result) << "Invalid fethcer setting.";
|
| + callback_.Run(true, data);
|
| + }
|
| +
|
| + WebViewInternalExecuteCodeFunction* function_;
|
| + const 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,34 @@ 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));
|
| +
|
| + WebUIURLFetcher* fetcher = new WebUIURLFetcher(
|
| + this, file_url, render_view_host()->GetProcess()->GetID(),
|
| + render_view_host()->GetRoutingID(), callback);
|
| + fetchers_.push_back(fetcher);
|
| + fetcher->Start();
|
| + return true;
|
| +}
|
| +
|
| +void WebViewInternalExecuteCodeFunction::OnWebUIURLFetchComplete(
|
| + const WebUIURLFetcher* fetcher,
|
| + bool is_success,
|
| + std::string data) {
|
| + fetchers_.erase(std::find(fetchers_.begin(), fetchers_.end(), fetcher));
|
| +}
|
| +
|
| WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() {
|
| }
|
|
|
|
|