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

Side by Side Diff: webkit/glue/alt_error_page_resource_fetcher.cc

Issue 149172: Modify ResourceFetcher to use WebURLLoader instead of ResourceHandle.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "config.h" 5 #include "config.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 8
9 MSVC_PUSH_WARNING_LEVEL(0); 9 MSVC_PUSH_WARNING_LEVEL(0);
10 #include "ResourceResponse.h" 10 #include "ResourceResponse.h"
11 MSVC_POP_WARNING(); 11 MSVC_POP_WARNING();
12 #undef LOG 12 #undef LOG
13 13
14 #include "webkit/glue/alt_error_page_resource_fetcher.h" 14 #include "webkit/glue/alt_error_page_resource_fetcher.h"
15 15
16 #include "webkit/api/public/WebDataSource.h" 16 #include "webkit/api/public/WebDataSource.h"
17 #include "webkit/api/public/WebURLRequest.h" 17 #include "webkit/api/public/WebURLRequest.h"
18 #include "webkit/glue/glue_util.h" 18 #include "webkit/glue/glue_util.h"
19 #include "webkit/glue/webframe_impl.h" 19 #include "webkit/glue/webframe_impl.h"
20 #include "webkit/glue/webview_delegate.h" 20 #include "webkit/glue/webview_delegate.h"
21 #include "webkit/glue/webview.h" 21 #include "webkit/glue/webview.h"
22 22
23 using WebKit::WebURLError; 23 using WebKit::WebURLError;
24 using WebKit::WebURLResponse;
25
26 namespace webkit_glue {
24 27
25 // Number of seconds to wait for the alternate error page server. If it takes 28 // Number of seconds to wait for the alternate error page server. If it takes
26 // too long, just use the local error page. 29 // too long, just use the local error page.
27 static const double kDownloadTimeoutSec = 3.0; 30 static const int kDownloadTimeoutSec = 3;
28 31
29 AltErrorPageResourceFetcher::AltErrorPageResourceFetcher( 32 AltErrorPageResourceFetcher::AltErrorPageResourceFetcher(
30 WebView* web_view, 33 WebView* web_view,
34 WebFrame* web_frame,
31 const WebURLError& web_error, 35 const WebURLError& web_error,
32 WebFrameImpl* web_frame,
33 const GURL& url) 36 const GURL& url)
34 : web_view_(web_view), 37 : web_view_(web_view),
35 web_error_(web_error), 38 web_error_(web_error),
36 web_frame_(web_frame) { 39 web_frame_(web_frame) {
37 failed_request_ = web_frame_->GetProvisionalDataSource()->request(); 40 failed_request_ = web_frame_->GetProvisionalDataSource()->request();
38 fetcher_.reset(new ResourceFetcherWithTimeout(url, web_frame->frame(), 41 fetcher_.reset(new ResourceFetcherWithTimeout(
39 kDownloadTimeoutSec, this)); 42 url, web_frame, kDownloadTimeoutSec,
43 NewCallback(this, &AltErrorPageResourceFetcher::OnURLFetchComplete)));
40 } 44 }
41 45
42 AltErrorPageResourceFetcher::~AltErrorPageResourceFetcher() { 46 AltErrorPageResourceFetcher::~AltErrorPageResourceFetcher() {
43 } 47 }
44 48
45 void AltErrorPageResourceFetcher::OnURLFetchComplete( 49 void AltErrorPageResourceFetcher::OnURLFetchComplete(
46 const WebCore::ResourceResponse& response, 50 const WebURLResponse& response,
47 const std::string& data) { 51 const std::string& data) {
48 WebViewDelegate* delegate = web_view_->GetDelegate(); 52 WebViewDelegate* delegate = web_view_->GetDelegate();
49 if (!delegate) 53 if (!delegate)
50 return; 54 return;
51 55
52 if (response.httpStatusCode() == 200) { 56 if (response.httpStatusCode() == 200) {
53 // We successfully got a response from the alternate error page server, so 57 // We successfully got a response from the alternate error page server, so
54 // load it. 58 // load it.
55 delegate->LoadNavigationErrorPage(web_frame_, failed_request_, 59 delegate->LoadNavigationErrorPage(web_frame_, failed_request_,
56 web_error_, data, true); 60 web_error_, data, true);
57 } else { 61 } else {
58 delegate->LoadNavigationErrorPage(web_frame_, failed_request_, 62 delegate->LoadNavigationErrorPage(web_frame_, failed_request_,
59 web_error_, std::string(), true); 63 web_error_, std::string(), true);
60 } 64 }
61 } 65 }
66
67 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698