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

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

Issue 434903002: Make webkitCancelFullScreen() an alias of webkitExitFullscreen() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: polish test 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/core/dom/DocumentFullscreen.idl ('k') | Source/web/FrameLoaderClientImpl.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 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
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 19 matching lines...) Expand all
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "web/ChromeClientImpl.h" 33 #include "web/ChromeClientImpl.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/accessibility/AXObject.h" 37 #include "core/accessibility/AXObject.h"
38 #include "core/accessibility/AXObjectCache.h" 38 #include "core/accessibility/AXObjectCache.h"
39 #include "core/dom/Document.h" 39 #include "core/dom/Document.h"
40 #include "core/dom/DocumentFullscreen.h" 40 #include "core/dom/FullscreenElementStack.h"
41 #include "core/dom/Node.h" 41 #include "core/dom/Node.h"
42 #include "core/events/KeyboardEvent.h" 42 #include "core/events/KeyboardEvent.h"
43 #include "core/events/MouseEvent.h" 43 #include "core/events/MouseEvent.h"
44 #include "core/events/WheelEvent.h" 44 #include "core/events/WheelEvent.h"
45 #include "core/frame/Console.h" 45 #include "core/frame/Console.h"
46 #include "core/frame/FrameView.h" 46 #include "core/frame/FrameView.h"
47 #include "core/frame/Settings.h" 47 #include "core/frame/Settings.h"
48 #include "core/html/HTMLInputElement.h" 48 #include "core/html/HTMLInputElement.h"
49 #include "core/loader/DocumentLoader.h" 49 #include "core/loader/DocumentLoader.h"
50 #include "core/loader/FrameLoadRequest.h" 50 #include "core/loader/FrameLoadRequest.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer) 217 NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer)
218 { 218 {
219 if (!m_webView->client()) 219 if (!m_webView->client())
220 return 0; 220 return 0;
221 221
222 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli cy); 222 WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPoli cy);
223 if (policy == WebNavigationPolicyIgnore) 223 if (policy == WebNavigationPolicyIgnore)
224 policy = getNavigationPolicy(); 224 policy = getNavigationPolicy();
225 225
226 ASSERT(frame->document()); 226 ASSERT(frame->document());
227 DocumentFullscreen::webkitCancelFullScreen(*frame->document()); 227 FullscreenElementStack::from(*frame->document()).fullyExitFullscreen();
228 228
229 WebViewImpl* newView = toWebViewImpl( 229 WebViewImpl* newView = toWebViewImpl(
230 m_webView->client()->createView(WebLocalFrameImpl::fromFrame(frame), Wra ppedResourceRequest(r.resourceRequest()), features, r.frameName(), policy, shoul dSendReferrer == NeverSendReferrer)); 230 m_webView->client()->createView(WebLocalFrameImpl::fromFrame(frame), Wra ppedResourceRequest(r.resourceRequest()), features, r.frameName(), policy, shoul dSendReferrer == NeverSendReferrer));
231 if (!newView) 231 if (!newView)
232 return 0; 232 return 0;
233 return newView->page(); 233 return newView->page();
234 } 234 }
235 235
236 static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, Navigat ionPolicy* policy) 236 static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, Navigat ionPolicy* policy)
237 { 237 {
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp utElement)); 876 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp utElement));
877 } 877 }
878 878
879 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) 879 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input)
880 { 880 {
881 if (m_webView->autofillClient()) 881 if (m_webView->autofillClient())
882 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in put)); 882 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in put));
883 } 883 }
884 884
885 } // namespace blink 885 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentFullscreen.idl ('k') | Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698