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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 6874038: Remove the last Chrome dependencies from renderer, and enforce no more includes through DEPS. I ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc (revision 81920)
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -66,6 +66,7 @@
#include "grit/renderer_resources.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
@@ -85,6 +86,7 @@
using autofill::FormManager;
using autofill::PasswordAutofillManager;
using WebKit::WebCache;
+using WebKit::WebDataSource;
using WebKit::WebFrame;
using WebKit::WebPlugin;
using WebKit::WebPluginParams;
@@ -398,7 +400,7 @@
plugin_setting == CONTENT_SETTING_ALLOW ||
host_setting == CONTENT_SETTING_ALLOW) {
// Delay loading plugins if prerendering.
- if (render_view->is_prerendering_) {
+ if (render_view->is_prerendering()) {
return CreatePluginPlaceholder(
render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML,
IDS_PLUGIN_LOAD, true, true);
@@ -406,9 +408,8 @@
bool pepper_plugin_was_registered = false;
scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
- render_view->pepper_delegate_.CreatePepperPlugin(
- info.path,
- &pepper_plugin_was_registered));
+ render_view->pepper_delegate()->CreatePepperPlugin(
+ info.path, &pepper_plugin_was_registered));
if (pepper_plugin_was_registered) {
if (pepper_module) {
return render_view->CreatePepperPlugin(
@@ -461,6 +462,22 @@
return blocked_plugin->plugin();
}
+void ChromeContentRendererClient::ShowErrorPage(RenderView* render_view,
+ WebKit::WebFrame* frame,
+ int http_status_code) {
+ // Use an internal error page, if we have one for the status code.
+ if (LocalizedError::HasStrings(LocalizedError::kHttpErrorDomain,
+ http_status_code)) {
+ WebURLError error;
+ error.unreachableURL = frame->url();
+ error.domain = WebString::fromUTF8(LocalizedError::kHttpErrorDomain);
+ error.reason = http_status_code;
+
+ render_view->LoadNavigationErrorPage(
+ frame, frame->dataSource()->request(), error, std::string(), true);
+ }
+}
+
std::string ChromeContentRendererClient::GetNavigationErrorHtml(
const WebURLRequest& failed_request,
const WebURLError& error) {

Powered by Google App Engine
This is Rietveld 408576698