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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 8142032: Add error description to the DidFailProvisionalLoad callback. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: incorporated feedback (style only, no functional changes) Created 9 years, 2 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/string16.h"
13 #include "content/public/renderer/content_renderer_client.h" 14 #include "content/public/renderer/content_renderer_client.h"
14 15
15 class ChromeRenderProcessObserver; 16 class ChromeRenderProcessObserver;
16 class ExtensionDispatcher; 17 class ExtensionDispatcher;
17 class RendererHistogramSnapshots; 18 class RendererHistogramSnapshots;
18 class RendererNetPredictor; 19 class RendererNetPredictor;
19 class SpellCheck; 20 class SpellCheck;
20 class SpellCheckProvider; 21 class SpellCheckProvider;
21 class VisitedLinkSlave; 22 class VisitedLinkSlave;
22 23
(...skipping 20 matching lines...) Expand all
43 virtual SkBitmap* GetSadPluginBitmap() OVERRIDE; 44 virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
44 virtual std::string GetDefaultEncoding() OVERRIDE; 45 virtual std::string GetDefaultEncoding() OVERRIDE;
45 virtual bool OverrideCreatePlugin( 46 virtual bool OverrideCreatePlugin(
46 RenderView* render_view, 47 RenderView* render_view,
47 WebKit::WebFrame* frame, 48 WebKit::WebFrame* frame,
48 const WebKit::WebPluginParams& params, 49 const WebKit::WebPluginParams& params,
49 WebKit::WebPlugin** plugin) OVERRIDE; 50 WebKit::WebPlugin** plugin) OVERRIDE;
50 virtual void ShowErrorPage(RenderView* render_view, 51 virtual void ShowErrorPage(RenderView* render_view,
51 WebKit::WebFrame* frame, 52 WebKit::WebFrame* frame,
52 int http_status_code) OVERRIDE; 53 int http_status_code) OVERRIDE;
53 virtual std::string GetNavigationErrorHtml( 54 virtual void GetNavigationErrorStrings(
54 const WebKit::WebURLRequest& failed_request, 55 const WebKit::WebURLRequest& failed_request,
55 const WebKit::WebURLError& error) OVERRIDE; 56 const WebKit::WebURLError& error,
57 std::string* error_html,
58 string16* error_description) OVERRIDE;
56 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; 59 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
57 virtual bool AllowPopup(const GURL& creator) OVERRIDE; 60 virtual bool AllowPopup(const GURL& creator) OVERRIDE;
58 virtual bool ShouldFork(WebKit::WebFrame* frame, 61 virtual bool ShouldFork(WebKit::WebFrame* frame,
59 const GURL& url, 62 const GURL& url,
60 bool is_content_initiated, 63 bool is_content_initiated,
61 bool is_initial_navigation, 64 bool is_initial_navigation,
62 bool* send_referrer) OVERRIDE; 65 bool* send_referrer) OVERRIDE;
63 virtual bool WillSendRequest(WebKit::WebFrame* frame, 66 virtual bool WillSendRequest(WebKit::WebFrame* frame,
64 const GURL& url, 67 const GURL& url,
65 GURL* new_url) OVERRIDE; 68 GURL* new_url) OVERRIDE;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // The SpellCheckProvider is a RenderViewObserver, and handles its own 128 // The SpellCheckProvider is a RenderViewObserver, and handles its own
126 // destruction. 129 // destruction.
127 SpellCheckProvider* spellcheck_provider_; 130 SpellCheckProvider* spellcheck_provider_;
128 scoped_ptr<VisitedLinkSlave> visited_link_slave_; 131 scoped_ptr<VisitedLinkSlave> visited_link_slave_;
129 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 132 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
130 }; 133 };
131 134
132 } // namespace chrome 135 } // namespace chrome
133 136
134 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 137 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698