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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 2384813002: Don't wait to close tabs waiting for JavaScript dialogs. (Closed)
Patch Set: remove code no longer needed 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 7f68105d23d6d92f335187d591aa803a1cfac19a..f80a86364b971e280cecc081cd06ba783f375998 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -565,11 +565,12 @@ class CONTENT_EXPORT WebContentsImpl
SessionStorageNamespace* GetSessionStorageNamespace(
SiteInstance* instance) override;
SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override;
+ double GetPendingPageZoomLevel() override;
FrameTree* GetFrameTree() override;
void SetIsVirtualKeyboardRequested(bool requested) override;
bool IsVirtualKeyboardRequested() override;
bool IsOverridingUserAgent() override;
- double GetPendingPageZoomLevel() override;
+ bool IsJavaScriptDialogShowing() const override;
// NavigatorDelegate ---------------------------------------------------------
@@ -1293,6 +1294,9 @@ class CONTENT_EXPORT WebContentsImpl
// delegate of this WebContentsImpl is nulled before its destructor is called.
JavaScriptDialogManager* dialog_manager_;
+ // Set to true when there is an active JavaScript dialog showing.
+ bool is_showing_javascript_dialog_ = false;
+
// Set to true when there is an active "before unload" dialog. When true,
// we've forced the throbber to start in Navigate, and we need to remember to
// turn it off in OnJavaScriptMessageBoxClosed if the navigation is canceled.
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698