OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_RENDER_FRAME_HOST_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
265 // If a cross-site request is in progress, we may be suspended while waiting | 265 // If a cross-site request is in progress, we may be suspended while waiting |
266 // for the onbeforeunload handler, so this function might buffer the message | 266 // for the onbeforeunload handler, so this function might buffer the message |
267 // rather than sending it. | 267 // rather than sending it. |
268 void Navigate(const FrameMsg_Navigate_Params& params); | 268 void Navigate(const FrameMsg_Navigate_Params& params); |
269 | 269 |
270 // Load the specified URL; this is a shortcut for Navigate(). | 270 // Load the specified URL; this is a shortcut for Navigate(). |
271 void NavigateToURL(const GURL& url); | 271 void NavigateToURL(const GURL& url); |
272 | 272 |
273 // Treat this prospective navigation as thought it originated from the | 273 // Treat this prospective navigation as thought it originated from the |
274 // frame. Used, e.g., for a navigation request that originated from | 274 // frame. Used, e.g., for a navigation request that originated from |
275 // a RemoteFrame. | 275 // a RemoteFrame. |site_instance| is the site instance that initiated the |
276 void OpenURL(const FrameHostMsg_OpenURL_Params& params); | 276 // navigation request, and should only be used when a cross-site navigation is |
277 // initiated by a remote frame. | |
Charlie Reis
2014/12/06 00:18:50
Let's call it source_site_instance and update the
lfg
2014/12/08 20:45:33
Done.
| |
278 void OpenURL(const FrameHostMsg_OpenURL_Params& params, | |
279 SiteInstance* site_instance); | |
277 | 280 |
278 // Stop the load in progress. | 281 // Stop the load in progress. |
279 void Stop(); | 282 void Stop(); |
280 | 283 |
281 // Returns whether navigation messages are currently suspended for this | 284 // Returns whether navigation messages are currently suspended for this |
282 // RenderFrameHost. Only true during a cross-site navigation, while waiting | 285 // RenderFrameHost. Only true during a cross-site navigation, while waiting |
283 // for the onbeforeunload handler. | 286 // for the onbeforeunload handler. |
284 bool are_navigations_suspended() const { return navigations_suspended_; } | 287 bool are_navigations_suspended() const { return navigations_suspended_; } |
285 | 288 |
286 // Suspends (or unsuspends) any navigation messages from being sent from this | 289 // Suspends (or unsuspends) any navigation messages from being sent from this |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
609 | 612 |
610 // NOTE: This must be the last member. | 613 // NOTE: This must be the last member. |
611 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; | 614 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
612 | 615 |
613 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 616 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
614 }; | 617 }; |
615 | 618 |
616 } // namespace content | 619 } // namespace content |
617 | 620 |
618 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 621 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
OLD | NEW |