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

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

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « webkit/glue/resource_fetcher.h ('k') | webkit/glue/resource_fetcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "webkit/glue/resource_fetcher.h" 5 #include "webkit/glue/resource_fetcher.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "webkit/api/public/WebFrame.h" 8 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
9 #include "webkit/api/public/WebKit.h" 9 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
10 #include "webkit/api/public/WebKitClient.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
11 #include "webkit/api/public/WebURLError.h" 11 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
12 #include "webkit/api/public/WebURLLoader.h" 12 #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h"
13 #include "webkit/api/public/WebURLRequest.h" 13 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
14 #include "webkit/api/public/WebURL.h" 14 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
15 15
16 using base::TimeDelta; 16 using base::TimeDelta;
17 using WebKit::WebFrame; 17 using WebKit::WebFrame;
18 using WebKit::WebURLError; 18 using WebKit::WebURLError;
19 using WebKit::WebURLLoader; 19 using WebKit::WebURLLoader;
20 using WebKit::WebURLRequest; 20 using WebKit::WebURLRequest;
21 using WebKit::WebURLResponse; 21 using WebKit::WebURLResponse;
22 22
23 namespace webkit_glue { 23 namespace webkit_glue {
24 24
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 112 }
113 113
114 void ResourceFetcherWithTimeout::TimeoutFired() { 114 void ResourceFetcherWithTimeout::TimeoutFired() {
115 if (!completed_) { 115 if (!completed_) {
116 loader_->cancel(); 116 loader_->cancel();
117 didFail(NULL, WebURLError()); 117 didFail(NULL, WebURLError());
118 } 118 }
119 } 119 }
120 120
121 } // namespace webkit_glue 121 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/resource_fetcher.h ('k') | webkit/glue/resource_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698