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

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

Issue 2384813002: Don't wait to close tabs waiting for JavaScript dialogs. (Closed)
Patch Set: fix Created 4 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 bool is_waiting_for_beforeunload_ack_; 929 bool is_waiting_for_beforeunload_ack_;
930 930
931 // Valid only when is_waiting_for_beforeunload_ack_ or 931 // Valid only when is_waiting_for_beforeunload_ack_ or
932 // IsWaitingForUnloadACK is true. This tells us if the unload request 932 // IsWaitingForUnloadACK is true. This tells us if the unload request
933 // is for closing the entire tab ( = false), or only this RenderFrameHost in 933 // is for closing the entire tab ( = false), or only this RenderFrameHost in
934 // the case of a navigation ( = true). Currently only cross-site navigations 934 // the case of a navigation ( = true). Currently only cross-site navigations
935 // require a beforeUnload/unload ACK. 935 // require a beforeUnload/unload ACK.
936 // PlzNavigate: all navigations require a beforeUnload ACK. 936 // PlzNavigate: all navigations require a beforeUnload ACK.
937 bool unload_ack_is_for_navigation_; 937 bool unload_ack_is_for_navigation_;
938 938
939 // True while a JavaScript dialog is shown.
940 bool is_within_javascript_dialog_ = false;
Charlie Reis 2016/10/05 22:00:59 Any chance the delegate knows if the dialog is sho
941
939 // Indicates whether this RenderFrameHost is in the process of loading a 942 // Indicates whether this RenderFrameHost is in the process of loading a
940 // document or not. 943 // document or not.
941 bool is_loading_; 944 bool is_loading_;
942 945
943 // PlzNavigate 946 // PlzNavigate
944 // Used to track whether a commit is expected in this frame. Only used in 947 // Used to track whether a commit is expected in this frame. Only used in
945 // tests. 948 // tests.
946 bool pending_commit_; 949 bool pending_commit_;
947 950
948 // The unique ID of the latest NavigationEntry that this RenderFrameHost is 951 // The unique ID of the latest NavigationEntry that this RenderFrameHost is
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 1049
1047 // NOTE: This must be the last member. 1050 // NOTE: This must be the last member.
1048 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1051 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1049 1052
1050 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1053 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1051 }; 1054 };
1052 1055
1053 } // namespace content 1056 } // namespace content
1054 1057
1055 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1058 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698