Chromium Code Reviews| 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..97e824f1f0effbefe68b1f2ec0b52dd494d59e96 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,24 @@ |
| #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 "extensions/common/error_utils.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; |
|
Devlin
2015/03/23 22:03:25
Nit: for the two places we use this, omit the "usi
Xi Han
2015/03/24 15:11:48
Actually, there are four places, but it is ok to o
|
| namespace webview = extensions::core_api::web_view_internal; |
| namespace { |
| @@ -28,6 +35,9 @@ const char kIndexedDBKey[] = "indexedDB"; |
| const char kLocalStorageKey[] = "localStorage"; |
| const char kWebSQLKey[] = "webSQL"; |
| const char kSinceKey[] = "since"; |
| +const char kBadFileEncodingError[] = |
| + "Could not load file '*' for content script. It isn't UTF-8 encoded."; |
| +const char kLoadFileError[] = "Failed to load file: \"*\". "; |
| int MaskForKey(const char* key) { |
| if (strcmp(key, kAppCacheKey) == 0) |
| @@ -49,6 +59,51 @@ 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(content::BrowserContext* context, |
| + const GURL& url, |
| + const ExecuteCodeFunction::WebUILoadFileCallback& callback) |
| + : context_(context), url_(url), callback_(callback) {} |
| + ~WebUIURLFetcher() override {} |
| + |
| + void Start(int render_process_id, int render_view_id) { |
| + fetcher_.reset(URLFetcher::Create(url_, URLFetcher::GET, this)); |
| + fetcher_->SetRequestContext(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); |
| + |
| + std::string data; |
| + bool result = false; |
| + if (fetcher_->GetStatus().status() == net::URLRequestStatus::SUCCESS) { |
| + result = fetcher_->GetResponseAsString(&data); |
| + DCHECK(result); |
| + } |
| + fetcher_.reset(); |
| + callback_.Run(result, data); |
| + } |
| + |
| + content::BrowserContext* context_; |
| + GURL url_; |
| + 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 +200,60 @@ 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)); |
| + |
| + url_fetcher_.reset( |
| + new WebUIURLFetcher(this->browser_context(), file_url, callback)); |
| + url_fetcher_->Start(render_view_host()->GetProcess()->GetID(), |
| + render_view_host()->GetRoutingID()); |
| + return true; |
| +} |
| + |
| +bool WebViewInternalExecuteCodeFunction::LoadFile(const std::string& file) { |
| + if (!extension()) { |
| + bool is_success = false; |
| + is_success = LoadFileForWebUI( |
| + *details_->file, |
| + base::Bind(&WebViewInternalExecuteCodeFunction::DidLoadFileForWebUI, |
| + this, file)); |
| + if (is_success) |
| + return true; |
| + |
| + SendResponse(false); |
| + error_ = ErrorUtils::FormatErrorMessage(kLoadFileError, file); |
| + return false; |
| + } |
| + return ExecuteCodeFunction::LoadFile(file); |
| +} |
| + |
| +void WebViewInternalExecuteCodeFunction::DidLoadFileForWebUI( |
|
Devlin
2015/03/23 22:03:25
This doesn't really do anything different than Did
Xi Han
2015/03/24 15:11:48
They are slightly different with each other, since
|
| + const std::string& file, |
| + bool success, |
| + const std::string& data) { |
| + if (success) { |
| + if (!base::IsStringUTF8(data)) { |
| + error_ = ErrorUtils::FormatErrorMessage(kBadFileEncodingError, file); |
| + SendResponse(false); |
| + } else if (!Execute(data)) |
| + SendResponse(false); |
| + } else { |
| + error_ = ErrorUtils::FormatErrorMessage(kLoadFileError, file); |
| + SendResponse(false); |
| + } |
| + url_fetcher_.reset(); |
| +} |
| + |
| WebViewInternalExecuteScriptFunction::WebViewInternalExecuteScriptFunction() { |
| } |