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

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

Issue 1048463004: PlzNavigate: track pending commits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed other occurences of main_test_rfh Created 5 years, 8 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 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 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 // is for closing the entire tab ( = false), or only this RenderFrameHost in 666 // is for closing the entire tab ( = false), or only this RenderFrameHost in
667 // the case of a navigation ( = true). Currently only cross-site navigations 667 // the case of a navigation ( = true). Currently only cross-site navigations
668 // require a beforeUnload/unload ACK. 668 // require a beforeUnload/unload ACK.
669 // PlzNavigate: all navigations require a beforeUnload ACK. 669 // PlzNavigate: all navigations require a beforeUnload ACK.
670 bool unload_ack_is_for_navigation_; 670 bool unload_ack_is_for_navigation_;
671 671
672 // Indicates whether this RenderFrameHost is in the process of loading a 672 // Indicates whether this RenderFrameHost is in the process of loading a
673 // document or not. 673 // document or not.
674 bool is_loading_; 674 bool is_loading_;
675 675
676 // PlzNavigate
677 // Used to track whether a commit is expected in this frame. Only used in
678 // tests.
679 bool pending_commit_;
680
676 // Used to swap out or shut down this RFH when the unload event is taking too 681 // Used to swap out or shut down this RFH when the unload event is taking too
677 // long to execute, depending on the number of active frames in the 682 // long to execute, depending on the number of active frames in the
678 // SiteInstance. 683 // SiteInstance.
679 scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_; 684 scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
680 685
681 scoped_ptr<ServiceRegistryImpl> service_registry_; 686 scoped_ptr<ServiceRegistryImpl> service_registry_;
682 687
683 #if defined(OS_ANDROID) 688 #if defined(OS_ANDROID)
684 scoped_ptr<ServiceRegistryAndroid> service_registry_android_; 689 scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
685 #endif 690 #endif
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 722
718 // NOTE: This must be the last member. 723 // NOTE: This must be the last member.
719 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 724 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
720 725
721 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 726 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
722 }; 727 };
723 728
724 } // namespace content 729 } // namespace content
725 730
726 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 731 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698