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

Side by Side Diff: chrome/browser/net/url_fetcher.cc

Issue 173049: Revert r23616 from 172. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 4 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
« no previous file with comments | « chrome/browser/chrome_plugin_host.cc ('k') | chrome/browser/plugin_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Reverse-merged /trunk/src/chrome/browser/net/url_fetcher.cc:r14162,14665,15308,15810,15899,15950,16015,16808,18093,18210,18321,18640,18871,19044,19692,19978,19995,21417,22284
Merged /trunk/src/chrome/browser/net/url_fetcher.cc:r22067
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/net/url_fetcher.h" 5 #include "chrome/browser/net/url_fetcher.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/thread.h" 9 #include "base/thread.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 26 matching lines...) Expand all
37 // reference, the IO thread could interrupt things, run a task, Release() 37 // reference, the IO thread could interrupt things, run a task, Release()
38 // us, and destroy us, leaving the caller with an already-destroyed object 38 // us, and destroy us, leaving the caller with an already-destroyed object
39 // when construction finishes. 39 // when construction finishes.
40 void Start(); 40 void Start();
41 41
42 // Stops any in-progress load and ensures no callback will happen. It is 42 // Stops any in-progress load and ensures no callback will happen. It is
43 // safe to call this multiple times. 43 // safe to call this multiple times.
44 void Stop(); 44 void Stop();
45 45
46 // URLRequest::Delegate implementations 46 // URLRequest::Delegate implementations
47 virtual void OnReceivedRedirect(URLRequest* request,
48 const GURL& new_url) { }
47 virtual void OnResponseStarted(URLRequest* request); 49 virtual void OnResponseStarted(URLRequest* request);
48 virtual void OnReadCompleted(URLRequest* request, int bytes_read); 50 virtual void OnReadCompleted(URLRequest* request, int bytes_read);
49 51
50 URLFetcher::Delegate* delegate() const { return delegate_; } 52 URLFetcher::Delegate* delegate() const { return delegate_; }
51 53
52 private: 54 private:
53 // Wrapper functions that allow us to ensure actions happen on the right 55 // Wrapper functions that allow us to ensure actions happen on the right
54 // thread. 56 // thread.
55 void StartURLRequest(); 57 void StartURLRequest();
56 void CancelURLRequest(); 58 void CancelURLRequest();
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 core_->Start(); 306 core_->Start();
305 } 307 }
306 308
307 const GURL& URLFetcher::url() const { 309 const GURL& URLFetcher::url() const {
308 return core_->url_; 310 return core_->url_;
309 } 311 }
310 312
311 URLFetcher::Delegate* URLFetcher::delegate() const { 313 URLFetcher::Delegate* URLFetcher::delegate() const {
312 return core_->delegate(); 314 return core_->delegate();
313 } 315 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_plugin_host.cc ('k') | chrome/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698