Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 #include "platform/FileChooser.h" | 94 #include "platform/FileChooser.h" |
| 95 #include "platform/PlatformScreen.h" | 95 #include "platform/PlatformScreen.h" |
| 96 #include "platform/exported/WrappedResourceRequest.h" | 96 #include "platform/exported/WrappedResourceRequest.h" |
| 97 #include "platform/geometry/FloatRect.h" | 97 #include "platform/geometry/FloatRect.h" |
| 98 #include "platform/geometry/IntRect.h" | 98 #include "platform/geometry/IntRect.h" |
| 99 #include "platform/weborigin/SecurityOrigin.h" | 99 #include "platform/weborigin/SecurityOrigin.h" |
| 100 #include "public/platform/Platform.h" | 100 #include "public/platform/Platform.h" |
| 101 #include "public/platform/WebCursorInfo.h" | 101 #include "public/platform/WebCursorInfo.h" |
| 102 #include "public/platform/WebRect.h" | 102 #include "public/platform/WebRect.h" |
| 103 #include "public/platform/WebURLRequest.h" | 103 #include "public/platform/WebURLRequest.h" |
| 104 #include "public/web/WebTouchAction.h" | |
| 104 #include "wtf/text/CString.h" | 105 #include "wtf/text/CString.h" |
| 105 #include "wtf/text/StringBuilder.h" | 106 #include "wtf/text/StringBuilder.h" |
| 106 #include "wtf/text/StringConcatenate.h" | 107 #include "wtf/text/StringConcatenate.h" |
| 107 #include "wtf/unicode/CharacterNames.h" | 108 #include "wtf/unicode/CharacterNames.h" |
| 108 | 109 |
| 109 using namespace WebCore; | 110 using namespace WebCore; |
| 110 | 111 |
| 111 namespace blink { | 112 namespace blink { |
| 112 | 113 |
| 113 // Converts a WebCore::PopupContainerType to a blink::WebPopupType. | 114 // Converts a WebCore::PopupContainerType to a blink::WebPopupType. |
| (...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 944 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandle rs) | 945 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandle rs) |
| 945 { | 946 { |
| 946 m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers); | 947 m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers); |
| 947 } | 948 } |
| 948 | 949 |
| 949 void ChromeClientImpl::needTouchEvents(bool needsTouchEvents) | 950 void ChromeClientImpl::needTouchEvents(bool needsTouchEvents) |
| 950 { | 951 { |
| 951 m_webView->hasTouchEventHandlers(needsTouchEvents); | 952 m_webView->hasTouchEventHandlers(needsTouchEvents); |
| 952 } | 953 } |
| 953 | 954 |
| 955 void ChromeClientImpl::setTouchAction(TouchAction touchAction) | |
|
esprehn
2013/11/21 16:26:29
Now it's singular, seems the plurals in the interf
| |
| 956 { | |
| 957 WebViewClient* client = m_webView->client(); | |
| 958 if (client) { | |
|
esprehn
2013/11/21 16:26:29
if (WebViewClient* client = ...) {
}
or an early
Rick Byers
2013/11/21 22:09:29
Done.
| |
| 959 WebTouchAction webTouchAction = static_cast<WebTouchAction>(touchAction) ; | |
| 960 client->setTouchAction(webTouchAction); | |
| 961 } | |
| 962 } | |
| 963 | |
| 954 bool ChromeClientImpl::requestPointerLock() | 964 bool ChromeClientImpl::requestPointerLock() |
| 955 { | 965 { |
| 956 return m_webView->requestPointerLock(); | 966 return m_webView->requestPointerLock(); |
| 957 } | 967 } |
| 958 | 968 |
| 959 void ChromeClientImpl::requestPointerUnlock() | 969 void ChromeClientImpl::requestPointerUnlock() |
| 960 { | 970 { |
| 961 return m_webView->requestPointerUnlock(); | 971 return m_webView->requestPointerUnlock(); |
| 962 } | 972 } |
| 963 | 973 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1033 { | 1043 { |
| 1034 } | 1044 } |
| 1035 | 1045 |
| 1036 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) | 1046 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) |
| 1037 { | 1047 { |
| 1038 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); | 1048 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); |
| 1039 } | 1049 } |
| 1040 #endif | 1050 #endif |
| 1041 | 1051 |
| 1042 } // namespace blink | 1052 } // namespace blink |
| OLD | NEW |