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

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

Issue 2787393003: Fix races in tests waiting for beforeunload dialogs. (Closed)
Patch Set: rev Created 3 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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1896 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1907 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1908 NotifyForEachFrameFromUI( 1908 NotifyForEachFrameFromUI(
1909 this, 1909 this,
1910 base::Bind(&ResourceDispatcherHostImpl::CancelBlockedRequestsForRoute)); 1910 base::Bind(&ResourceDispatcherHostImpl::CancelBlockedRequestsForRoute));
1911 } 1911 }
1912 1912
1913 void RenderFrameHostImpl::DisableBeforeUnloadHangMonitorForTesting() { 1913 void RenderFrameHostImpl::DisableBeforeUnloadHangMonitorForTesting() {
1914 beforeunload_timeout_.reset(); 1914 beforeunload_timeout_.reset();
1915 } 1915 }
1916 1916
1917 bool RenderFrameHostImpl::IsBeforeUnloadHangMonitorDisabledForTesting() {
1918 return !beforeunload_timeout_;
1919 }
1920
1917 void RenderFrameHostImpl::OnDidAccessInitialDocument() { 1921 void RenderFrameHostImpl::OnDidAccessInitialDocument() {
1918 delegate_->DidAccessInitialDocument(); 1922 delegate_->DidAccessInitialDocument();
1919 } 1923 }
1920 1924
1921 void RenderFrameHostImpl::OnDidChangeOpener(int32_t opener_routing_id) { 1925 void RenderFrameHostImpl::OnDidChangeOpener(int32_t opener_routing_id) {
1922 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id, 1926 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id,
1923 GetSiteInstance()); 1927 GetSiteInstance());
1924 } 1928 }
1925 1929
1926 void RenderFrameHostImpl::OnDidChangeName(const std::string& name, 1930 void RenderFrameHostImpl::OnDidChangeName(const std::string& name,
(...skipping 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after
3678 service_manager::mojom::InterfaceProviderPtr provider; 3682 service_manager::mojom::InterfaceProviderPtr provider;
3679 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3683 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3680 java_interfaces_.reset(new service_manager::InterfaceProvider); 3684 java_interfaces_.reset(new service_manager::InterfaceProvider);
3681 java_interfaces_->Bind(std::move(provider)); 3685 java_interfaces_->Bind(std::move(provider));
3682 } 3686 }
3683 return java_interfaces_.get(); 3687 return java_interfaces_.get();
3684 } 3688 }
3685 #endif 3689 #endif
3686 3690
3687 } // namespace content 3691 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698