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

Side by Side Diff: content/browser/frame_host/navigation_request.h

Issue 1255103003: Fix race when reloading original URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_NAVIGATION_REQUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 RESPONSE_STARTED, 50 RESPONSE_STARTED,
51 51
52 // The request failed on the IO thread and an error page should be 52 // The request failed on the IO thread and an error page should be
53 // displayed. This is one of the two final states for the request. 53 // displayed. This is one of the two final states for the request.
54 FAILED, 54 FAILED,
55 }; 55 };
56 56
57 // Creates a request for a browser-intiated navigation. 57 // Creates a request for a browser-intiated navigation.
58 static scoped_ptr<NavigationRequest> CreateBrowserInitiated( 58 static scoped_ptr<NavigationRequest> CreateBrowserInitiated(
59 FrameTreeNode* frame_tree_node, 59 FrameTreeNode* frame_tree_node,
60 const GURL& dest_url,
61 const Referrer& dest_referrer,
60 const FrameNavigationEntry& frame_entry, 62 const FrameNavigationEntry& frame_entry,
61 const NavigationEntryImpl& entry, 63 const NavigationEntryImpl& entry,
62 FrameMsg_Navigate_Type::Value navigation_type, 64 FrameMsg_Navigate_Type::Value navigation_type,
63 bool is_same_document_history_load, 65 bool is_same_document_history_load,
64 base::TimeTicks navigation_start, 66 base::TimeTicks navigation_start,
65 NavigationControllerImpl* controller); 67 NavigationControllerImpl* controller);
66 68
67 // Creates a request for a renderer-intiated navigation. 69 // Creates a request for a renderer-intiated navigation.
68 // Note: |body| is sent to the IO thread when calling BeginNavigation, and 70 // Note: |body| is sent to the IO thread when calling BeginNavigation, and
69 // should no longer be manipulated afterwards on the UI thread. 71 // should no longer be manipulated afterwards on the UI thread.
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 NavigationEntryImpl::RestoreType restore_type_; 168 NavigationEntryImpl::RestoreType restore_type_;
167 bool is_view_source_; 169 bool is_view_source_;
168 int bindings_; 170 int bindings_;
169 171
170 DISALLOW_COPY_AND_ASSIGN(NavigationRequest); 172 DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
171 }; 173 };
172 174
173 } // namespace content 175 } // namespace content
174 176
175 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 177 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigation_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698