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

Side by Side Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 476763004: Rename FullscreenElementStack to just Fullscreen (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | Source/web/FullscreenController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 17 matching lines...) Expand all
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "web/FrameLoaderClientImpl.h" 33 #include "web/FrameLoaderClientImpl.h"
34 34
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "core/HTMLNames.h" 36 #include "core/HTMLNames.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/FullscreenElementStack.h" 38 #include "core/dom/Fullscreen.h"
39 #include "core/events/MessageEvent.h" 39 #include "core/events/MessageEvent.h"
40 #include "core/events/MouseEvent.h" 40 #include "core/events/MouseEvent.h"
41 #include "core/frame/FrameView.h" 41 #include "core/frame/FrameView.h"
42 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
43 #include "core/html/HTMLAppletElement.h" 43 #include "core/html/HTMLAppletElement.h"
44 #include "core/loader/DocumentLoader.h" 44 #include "core/loader/DocumentLoader.h"
45 #include "core/loader/FrameLoadRequest.h" 45 #include "core/loader/FrameLoadRequest.h"
46 #include "core/loader/FrameLoader.h" 46 #include "core/loader/FrameLoader.h"
47 #include "core/loader/HistoryItem.h" 47 #include "core/loader/HistoryItem.h"
48 #include "core/page/Chrome.h" 48 #include "core/page/Chrome.h"
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 void FrameLoaderClientImpl::didStopLoading() 521 void FrameLoaderClientImpl::didStopLoading()
522 { 522 {
523 if (m_webFrame->client()) 523 if (m_webFrame->client())
524 m_webFrame->client()->didStopLoading(); 524 m_webFrame->client()->didStopLoading();
525 } 525 }
526 526
527 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName) 527 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na vigationPolicy policy, const String& suggestedName)
528 { 528 {
529 if (m_webFrame->client()) { 529 if (m_webFrame->client()) {
530 ASSERT(m_webFrame->frame()->document()); 530 ASSERT(m_webFrame->frame()->document());
531 FullscreenElementStack::from(*m_webFrame->frame()->document()).fullyExit Fullscreen(); 531 Fullscreen::from(*m_webFrame->frame()->document()).fullyExitFullscreen() ;
532 WrappedResourceRequest webreq(request); 532 WrappedResourceRequest webreq(request);
533 m_webFrame->client()->loadURLExternally( 533 m_webFrame->client()->loadURLExternally(
534 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName); 534 m_webFrame, webreq, static_cast<WebNavigationPolicy>(policy), sugges tedName);
535 } 535 }
536 } 536 }
537 537
538 bool FrameLoaderClientImpl::navigateBackForward(int offset) const 538 bool FrameLoaderClientImpl::navigateBackForward(int offset) const
539 { 539 {
540 WebViewImpl* webview = m_webFrame->viewImpl(); 540 WebViewImpl* webview = m_webFrame->viewImpl();
541 if (!webview->client()) 541 if (!webview->client())
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 m_webFrame->client()->didAbortLoading(m_webFrame); 827 m_webFrame->client()->didAbortLoading(m_webFrame);
828 } 828 }
829 829
830 void FrameLoaderClientImpl::dispatchDidChangeManifest() 830 void FrameLoaderClientImpl::dispatchDidChangeManifest()
831 { 831 {
832 if (m_webFrame->client()) 832 if (m_webFrame->client())
833 m_webFrame->client()->didChangeManifest(m_webFrame); 833 m_webFrame->client()->didChangeManifest(m_webFrame);
834 } 834 }
835 835
836 } // namespace blink 836 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698