diff options
Diffstat (limited to 'src/com/android/browser/Controller.java')
| -rw-r--r-- | src/com/android/browser/Controller.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 7f40aea..e84e397 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -513,7 +513,7 @@ public class Controller case R.id.download_context_menu_id: DownloadHandler.onDownloadStartNoStream( mActivity, url, view.getSettings().getUserAgentString(), - null, null, view.isPrivateBrowsingEnabled()); + null, null, null, view.isPrivateBrowsingEnabled()); break; } break; @@ -1031,10 +1031,11 @@ public class Controller @Override public void onDownloadStart(Tab tab, String url, String userAgent, - String contentDisposition, String mimetype, long contentLength) { + String contentDisposition, String mimetype, String referer, + long contentLength) { WebView w = tab.getWebView(); DownloadHandler.onDownloadStart(mActivity, url, userAgent, - contentDisposition, mimetype, w.isPrivateBrowsingEnabled()); + contentDisposition, mimetype, referer, w.isPrivateBrowsingEnabled()); if (w.copyBackForwardList().getSize() == 0) { // This Tab was opened for the sole purpose of downloading a // file. Remove it. @@ -2174,7 +2175,7 @@ public class Controller saveDataUri(); } else { DownloadHandler.onDownloadStartNoStream(mActivity, mText, mUserAgent, - null, null, mPrivateBrowsing); + null, null, null, mPrivateBrowsing); } return true; } @@ -2576,6 +2577,9 @@ public class Controller if (data.isPreloaded()) { // this isn't called for preloaded tabs } else { + if (t != null && data.mDisableUrlOverride) { + t.disableUrlOverridingForLoad(); + } loadUrl(t, data.mUrl, data.mHeaders); } } |