diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 17:36:55 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 17:36:55 +0000 |
commit | 7ccddb8cc40f885a50541c4f45afc4253ce3c065 (patch) | |
tree | a82976f8905298f6c320ff72331fd41697bc1aa5 /chrome/browser/tab_contents/tab_contents.cc | |
parent | b881ade17222078ce4e0c4dc6cb296ac34ee7387 (diff) | |
download | chromium_src-7ccddb8cc40f885a50541c4f45afc4253ce3c065.zip chromium_src-7ccddb8cc40f885a50541c4f45afc4253ce3c065.tar.gz chromium_src-7ccddb8cc40f885a50541c4f45afc4253ce3c065.tar.bz2 |
Move alternate 404 error page loading out of WebFrame and into RenderView.
This involved adding a new method on WebViewDelegate to allow the embedder to
intercept data being loaded for a document.
I also had to plumb a few more FrameLoaderClient notifications through
WebViewDelegate. See DidReceiveResponse and DidFinishLoading.
R=tony
BUG=15648
TEST=covered by errorpage_uitest.cc
Review URL: http://codereview.chromium.org/160578
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.cc')
-rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 7fcbe0a..9b11bdc 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -2201,8 +2201,8 @@ GURL TabContents::GetAlternateErrorPageURL() const { WebPreferences TabContents::GetWebkitPrefs() { PrefService* prefs = render_view_host()->process()->profile()->GetPrefs(); - bool isDomUI = false; - return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, isDomUI); + bool is_dom_ui = false; + return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, is_dom_ui); } void TabContents::OnJSOutOfMemory() { |