Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 160578: Move alternate 404 error page loading out of WebFrame and into RenderView.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/renderer/navigation_state.h » ('j') | chrome/renderer/render_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 DCHECK(prefs); 2194 DCHECK(prefs);
2195 if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) { 2195 if (prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled)) {
2196 url = google_util::AppendGoogleLocaleParam(GURL(kLinkDoctorBaseURL)); 2196 url = google_util::AppendGoogleLocaleParam(GURL(kLinkDoctorBaseURL));
2197 url = google_util::AppendGoogleTLDParam(url); 2197 url = google_util::AppendGoogleTLDParam(url);
2198 } 2198 }
2199 return url; 2199 return url;
2200 } 2200 }
2201 2201
2202 WebPreferences TabContents::GetWebkitPrefs() { 2202 WebPreferences TabContents::GetWebkitPrefs() {
2203 PrefService* prefs = render_view_host()->process()->profile()->GetPrefs(); 2203 PrefService* prefs = render_view_host()->process()->profile()->GetPrefs();
2204 bool isDomUI = false; 2204 bool is_dom_ui = false;
2205 return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, isDomUI); 2205 return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, is_dom_ui);
2206 } 2206 }
2207 2207
2208 void TabContents::OnJSOutOfMemory() { 2208 void TabContents::OnJSOutOfMemory() {
2209 AddInfoBar(new SimpleAlertInfoBarDelegate( 2209 AddInfoBar(new SimpleAlertInfoBarDelegate(
2210 this, l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL)); 2210 this, l10n_util::GetString(IDS_JS_OUT_OF_MEMORY_PROMPT), NULL));
2211 } 2211 }
2212 2212
2213 void TabContents::OnCrossSiteResponse(int new_render_process_host_id, 2213 void TabContents::OnCrossSiteResponse(int new_render_process_host_id,
2214 int new_request_id) { 2214 int new_request_id) {
2215 // Allows the TabContents to react when a cross-site response is ready to be 2215 // Allows the TabContents to react when a cross-site response is ready to be
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
2377 NavigationController::LoadCommittedDetails& committed_details = 2377 NavigationController::LoadCommittedDetails& committed_details =
2378 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); 2378 *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
2379 ExpireInfoBars(committed_details); 2379 ExpireInfoBars(committed_details);
2380 break; 2380 break;
2381 } 2381 }
2382 2382
2383 default: 2383 default:
2384 NOTREACHED(); 2384 NOTREACHED();
2385 } 2385 }
2386 } 2386 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/navigation_state.h » ('j') | chrome/renderer/render_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698