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

Side by Side Diff: trunk/src/content/browser/loader/cross_site_resource_handler.h

Issue 26472004: Revert 227318 "Clean up ResourceHandler API." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 5 #ifndef CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
6 #define CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 6 #define CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
7 7
8 #include "content/browser/loader/layered_resource_handler.h" 8 #include "content/browser/loader/layered_resource_handler.h"
9 #include "net/url_request/url_request_status.h" 9 #include "net/url_request/url_request_status.h"
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 private: 47 private:
48 // Prepare to render the cross-site response in a new RenderViewHost, by 48 // Prepare to render the cross-site response in a new RenderViewHost, by
49 // telling the old RenderViewHost to run its onunload handler. 49 // telling the old RenderViewHost to run its onunload handler.
50 void StartCrossSiteTransition(int request_id, 50 void StartCrossSiteTransition(int request_id,
51 ResourceResponse* response, 51 ResourceResponse* response,
52 bool should_transfer); 52 bool should_transfer);
53 53
54 void ResumeIfDeferred(); 54 void ResumeIfDeferred();
55 55
56 net::URLRequest* request_;
56 bool has_started_response_; 57 bool has_started_response_;
57 bool in_cross_site_transition_; 58 bool in_cross_site_transition_;
58 bool completed_during_transition_; 59 bool completed_during_transition_;
59 bool did_defer_; 60 bool did_defer_;
60 net::URLRequestStatus completed_status_; 61 net::URLRequestStatus completed_status_;
61 std::string completed_security_info_; 62 std::string completed_security_info_;
62 ResourceResponse* response_; 63 ResourceResponse* response_;
63 64
64 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler); 65 DISALLOW_COPY_AND_ASSIGN(CrossSiteResourceHandler);
65 }; 66 };
66 67
67 } // namespace content 68 } // namespace content
68 69
69 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_ 70 #endif // CONTENT_BROWSER_LOADER_CROSS_SITE_RESOURCE_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698