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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 2738943002: Move beforeunload hang timer duties to its own timer. (Closed)
Patch Set: better test Created 3 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <functional> 10 #include <functional>
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest, PageDoesBackAndReload); 836 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest, PageDoesBackAndReload);
837 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrossSiteIframe); 837 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrossSiteIframe);
838 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 838 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
839 TwoSubframesCreatePopupsSimultaneously); 839 TwoSubframesCreatePopupsSimultaneously);
840 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 840 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
841 TwoSubframesCreatePopupMenuWidgetsSimultaneously); 841 TwoSubframesCreatePopupMenuWidgetsSimultaneously);
842 FRIEND_TEST_ALL_PREFIXES(SitePerProcessAccessibilityBrowserTest, 842 FRIEND_TEST_ALL_PREFIXES(SitePerProcessAccessibilityBrowserTest,
843 CrossSiteIframeAccessibility); 843 CrossSiteIframeAccessibility);
844 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest, 844 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest,
845 JavaScriptDialogsInMainAndSubframes); 845 JavaScriptDialogsInMainAndSubframes);
846 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostImplBrowserTest,
847 IframeBeforeUnloadParentHang);
846 848
847 // So |find_request_manager_| can be accessed for testing. 849 // So |find_request_manager_| can be accessed for testing.
848 friend class FindRequestManagerTest; 850 friend class FindRequestManagerTest;
849 851
850 // TODO(brettw) TestWebContents shouldn't exist! 852 // TODO(brettw) TestWebContents shouldn't exist!
851 friend class TestWebContents; 853 friend class TestWebContents;
852 854
853 class DestructionObserver; 855 class DestructionObserver;
854 856
855 // Represents a WebContents node in a tree of WebContents structure. 857 // Represents a WebContents node in a tree of WebContents structure.
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 // Adds/removes a callback called on creation of each new WebContents. 1549 // Adds/removes a callback called on creation of each new WebContents.
1548 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1550 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1549 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1551 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1550 1552
1551 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1553 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1552 }; 1554 };
1553 1555
1554 } // namespace content 1556 } // namespace content
1555 1557
1556 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1558 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_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