diff options
| author | creis <creis@chromium.org> | 2015-02-12 15:29:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 23:30:36 +0000 |
| commit | 7b2d3d199ebcd0109d0ba4fd71d201510408c789 (patch) | |
| tree | 46f8e09b3c9f6fe79308e5adf59cc82926358e90 /chromecast/browser | |
| parent | 75c2b017bd1ab668d7f20fde6af6f5506a842c02 (diff) | |
| download | chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.zip chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.tar.gz chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.tar.bz2 | |
Call ComputeWebKitPrefs on the correct RVH, and remove dead code.
RenderViewHost was calling out to WebContents to get the URL, but it
was getting the wrong URL (e.g., possibly the transient one) and then
never looking at it. Worse, WebContents then called ComputeWebkitPrefs
on the wrong RVH (the old one, not the pending one).
This only seems to come up in corner cases, like chrome://history on
Android when Javascript is disabled.
BUG=454063
TEST=See bug.
TBR=jam
Review URL: https://codereview.chromium.org/919933002
Cr-Commit-Position: refs/heads/master@{#316081}
Diffstat (limited to 'chromecast/browser')
| -rw-r--r-- | chromecast/browser/cast_content_browser_client.cc | 1 | ||||
| -rw-r--r-- | chromecast/browser/cast_content_browser_client.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc index 6578a4f..57cbbf2 100644 --- a/chromecast/browser/cast_content_browser_client.cc +++ b/chromecast/browser/cast_content_browser_client.cc @@ -146,7 +146,6 @@ content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() { void CastContentBrowserClient::OverrideWebkitPrefs( content::RenderViewHost* render_view_host, - const GURL& url, content::WebPreferences* prefs) { prefs->allow_scripts_to_close_windows = true; // TODO(lcwu): http://crbug.com/391089. This pref is set to true by default diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h index 476d660..31d0eeb 100644 --- a/chromecast/browser/cast_content_browser_client.h +++ b/chromecast/browser/cast_content_browser_client.h @@ -42,7 +42,6 @@ class CastContentBrowserClient: public content::ContentBrowserClient { int child_process_id) override; content::AccessTokenStore* CreateAccessTokenStore() override; void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, - const GURL& url, content::WebPreferences* prefs) override; std::string GetApplicationLocale() override; void AllowCertificateError( |