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

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

Issue 2919593007: Always update the omnibox URL when cancelling via onbeforeunload (Closed)
Patch Set: Merge remote-tracking branch 'origin/master' into spoof Created 3 years, 6 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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 void RenderViewCreated(RenderViewHost* render_view_host) override; 574 void RenderViewCreated(RenderViewHost* render_view_host) override;
575 void RenderViewReady(RenderViewHost* render_view_host) override; 575 void RenderViewReady(RenderViewHost* render_view_host) override;
576 void RenderViewTerminated(RenderViewHost* render_view_host, 576 void RenderViewTerminated(RenderViewHost* render_view_host,
577 base::TerminationStatus status, 577 base::TerminationStatus status,
578 int error_code) override; 578 int error_code) override;
579 void RenderViewDeleted(RenderViewHost* render_view_host) override; 579 void RenderViewDeleted(RenderViewHost* render_view_host) override;
580 void UpdateTargetURL(RenderViewHost* render_view_host, 580 void UpdateTargetURL(RenderViewHost* render_view_host,
581 const GURL& url) override; 581 const GURL& url) override;
582 void Close(RenderViewHost* render_view_host) override; 582 void Close(RenderViewHost* render_view_host) override;
583 void RequestMove(const gfx::Rect& new_bounds) override; 583 void RequestMove(const gfx::Rect& new_bounds) override;
584 void DidCancelLoading() override;
585 void DocumentAvailableInMainFrame(RenderViewHost* render_view_host) override; 584 void DocumentAvailableInMainFrame(RenderViewHost* render_view_host) override;
586 void RouteCloseEvent(RenderViewHost* rvh) override; 585 void RouteCloseEvent(RenderViewHost* rvh) override;
587 bool DidAddMessageToConsole(int32_t level, 586 bool DidAddMessageToConsole(int32_t level,
588 const base::string16& message, 587 const base::string16& message,
589 int32_t line_no, 588 int32_t line_no,
590 const base::string16& source_id) override; 589 const base::string16& source_id) override;
591 RendererPreferences GetRendererPrefs( 590 RendererPreferences GetRendererPrefs(
592 BrowserContext* browser_context) const override; 591 BrowserContext* browser_context) const override;
593 void OnUserInteraction(RenderWidgetHostImpl* render_widget_host, 592 void OnUserInteraction(RenderWidgetHostImpl* render_widget_host,
594 const blink::WebInputEvent::Type type) override; 593 const blink::WebInputEvent::Type type) override;
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 911 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
913 TwoSubframesCreatePopupsSimultaneously); 912 TwoSubframesCreatePopupsSimultaneously);
914 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, 913 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
915 TwoSubframesCreatePopupMenuWidgetsSimultaneously); 914 TwoSubframesCreatePopupMenuWidgetsSimultaneously);
916 FRIEND_TEST_ALL_PREFIXES(SitePerProcessAccessibilityBrowserTest, 915 FRIEND_TEST_ALL_PREFIXES(SitePerProcessAccessibilityBrowserTest,
917 CrossSiteIframeAccessibility); 916 CrossSiteIframeAccessibility);
918 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest, 917 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest,
919 JavaScriptDialogsInMainAndSubframes); 918 JavaScriptDialogsInMainAndSubframes);
920 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest, 919 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest,
921 DialogsFromJavaScriptEndFullscreen); 920 DialogsFromJavaScriptEndFullscreen);
921 FRIEND_TEST_ALL_PREFIXES(WebContentsImplBrowserTest,
922 DismissingBeforeUnloadDialogInvalidatesUrl);
922 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostImplBrowserTest, 923 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostImplBrowserTest,
923 IframeBeforeUnloadParentHang); 924 IframeBeforeUnloadParentHang);
924 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostImplBrowserTest, 925 FRIEND_TEST_ALL_PREFIXES(RenderFrameHostImplBrowserTest,
925 BeforeUnloadDialogRequiresGesture); 926 BeforeUnloadDialogRequiresGesture);
926 927
927 // So |find_request_manager_| can be accessed for testing. 928 // So |find_request_manager_| can be accessed for testing.
928 friend class FindRequestManagerTest; 929 friend class FindRequestManagerTest;
929 930
930 // TODO(brettw) TestWebContents shouldn't exist! 931 // TODO(brettw) TestWebContents shouldn't exist!
931 friend class TestWebContents; 932 friend class TestWebContents;
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 // Adds/removes a callback called on creation of each new WebContents. 1656 // Adds/removes a callback called on creation of each new WebContents.
1656 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1657 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1657 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1658 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1658 1659
1659 DISALLOW_COPY_AND_ASSIGN(FriendWrapper); 1660 DISALLOW_COPY_AND_ASSIGN(FriendWrapper);
1660 }; 1661 };
1661 1662
1662 } // namespace content 1663 } // namespace content
1663 1664
1664 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1665 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.h ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698