diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-28 21:49:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:00 +0100 |
| commit | ddb351dbec246cf1fab5ec20d2d5520909041de1 (patch) | |
| tree | 158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /webkit/glue/alt_error_page_resource_fetcher.cc | |
| parent | 6b92e04f5f151c896e3088e86f70db7081009308 (diff) | |
| download | external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2 | |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'webkit/glue/alt_error_page_resource_fetcher.cc')
| -rw-r--r-- | webkit/glue/alt_error_page_resource_fetcher.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/alt_error_page_resource_fetcher.cc b/webkit/glue/alt_error_page_resource_fetcher.cc index 4e1867d..da95e47 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.cc +++ b/webkit/glue/alt_error_page_resource_fetcher.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,6 +9,7 @@ using WebKit::WebFrame; using WebKit::WebURLError; +using WebKit::WebURLRequest; using WebKit::WebURLResponse; namespace webkit_glue { @@ -26,7 +27,7 @@ AltErrorPageResourceFetcher::AltErrorPageResourceFetcher( callback_(callback), original_error_(original_error) { fetcher_.reset(new ResourceFetcherWithTimeout( - url, frame, kDownloadTimeoutSec, + url, frame, WebURLRequest::TargetIsMainFrame, kDownloadTimeoutSec, NewCallback(this, &AltErrorPageResourceFetcher::OnURLFetchComplete))); } |