From 994be9cdabbfa1fdea148643dfa0d6e16ed2c531 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sat, 6 Jun 2015 17:51:27 +0800 Subject: [PATCH 1/4] :memo: Add missing `httpreferer` option doc. --- docs/api/browser-window.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index ab7766981dc..67d31f27bd9 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -571,9 +571,9 @@ Calling `window.print()` in web page is equivalent to call doesn't need print feature, you can safely remove `pdf.dll` in saving binary size. -### BrowserWindow.loadUrl(url) +### BrowserWindow.loadUrl(url, [options]) -Same with `webContents.loadUrl(url)`. +Same with `webContents.loadUrl(url, [options])`. ### BrowserWindow.reload() @@ -778,9 +778,11 @@ Emitted when a plugin process is crashed. Emitted when the WebContents is destroyed. -### WebContents.loadUrl(url) +### WebContents.loadUrl(url, [options]) * `url` URL +* `options` URL + * `httpreferrer` String - A HTTP Referer url Loads the `url` in the window, the `url` must contains the protocol prefix, e.g. the `http://` or `file://`. From bf1765f941f60eeae4f14bd4c344e063176516d0 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Mon, 8 Jun 2015 14:29:30 +0800 Subject: [PATCH 2/4] :memo: Add missing `useragent` doc. --- docs/api/browser-window.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index 67d31f27bd9..768200dc5e4 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -783,6 +783,7 @@ Emitted when the WebContents is destroyed. * `url` URL * `options` URL * `httpreferrer` String - A HTTP Referer url + * `useragent` String - A user agent originating the request Loads the `url` in the window, the `url` must contains the protocol prefix, e.g. the `http://` or `file://`. From 488801e2447481aea9affda152a5965244bf1aca Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Tue, 9 Jun 2015 09:27:57 +0800 Subject: [PATCH 3/4] Rename httpreferrer to httpReferrer, useragent to userAgent. --- atom/browser/api/atom_api_web_contents.cc | 4 ++-- docs/api/browser-window.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 3d925b83991..848b243f317 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -430,12 +430,12 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) { content::NavigationController::LoadURLParams params(url); GURL http_referrer; - if (options.Get("httpreferrer", &http_referrer)) + if (options.Get("httpReferrer", &http_referrer)) params.referrer = content::Referrer(http_referrer.GetAsReferrer(), blink::WebReferrerPolicyDefault); std::string user_agent; - if (options.Get("useragent", &user_agent)) + if (options.Get("userAgent", &user_agent)) SetUserAgent(user_agent); params.transition_type = ui::PAGE_TRANSITION_TYPED; diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index 768200dc5e4..e60a7d22799 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -782,8 +782,8 @@ Emitted when the WebContents is destroyed. * `url` URL * `options` URL - * `httpreferrer` String - A HTTP Referer url - * `useragent` String - A user agent originating the request + * `httpReferrer` String - A HTTP Referer url + * `userAgent` String - A user agent originating the request Loads the `url` in the window, the `url` must contains the protocol prefix, e.g. the `http://` or `file://`. From f1a8c5a1ca63a64803e16be07e99ade68982cf7e Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Tue, 9 Jun 2015 10:44:06 +0800 Subject: [PATCH 4/4] Use httpReferrer and userAgent new names in webview. --- atom/browser/lib/guest-view-manager.coffee | 4 ++-- atom/renderer/lib/web-view/web-view-attributes.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/lib/guest-view-manager.coffee b/atom/browser/lib/guest-view-manager.coffee index 6e3447eece3..43624b891c8 100644 --- a/atom/browser/lib/guest-view-manager.coffee +++ b/atom/browser/lib/guest-view-manager.coffee @@ -68,8 +68,8 @@ createGuest = (embedder, params) -> if params.src opts = {} - opts.httpreferrer = params.httpreferrer if params.httpreferrer - opts.useragent = params.useragent if params.useragent + opts.httpReferrer = params.httpreferrer if params.httpreferrer + opts.userAgent = params.useragent if params.useragent @loadUrl params.src, opts if params.allowtransparency? diff --git a/atom/renderer/lib/web-view/web-view-attributes.coffee b/atom/renderer/lib/web-view/web-view-attributes.coffee index 37002aefc4b..82229aae57b 100644 --- a/atom/renderer/lib/web-view/web-view-attributes.coffee +++ b/atom/renderer/lib/web-view/web-view-attributes.coffee @@ -171,10 +171,10 @@ class SrcAttribute extends WebViewAttribute # Navigate to |this.src|. opts = {} httpreferrer = @webViewImpl.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER].getValue() - if httpreferrer then opts.httpreferrer = httpreferrer + if httpreferrer then opts.httpReferrer = httpreferrer useragent = @webViewImpl.attributes[webViewConstants.ATTRIBUTE_USERAGENT].getValue() - if useragent then opts.useragent = useragent + if useragent then opts.userAgent = useragent guestContents = remote.getGuestWebContents(@webViewImpl.guestInstanceId) guestContents.loadUrl @getValue(), opts