Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ |
| 6 #define CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/platform_file.h" | 10 #include "base/platform_file.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 virtual void setDeviceMotionListener( | 138 virtual void setDeviceMotionListener( |
| 139 WebKit::WebDeviceMotionListener* listener) OVERRIDE; | 139 WebKit::WebDeviceMotionListener* listener) OVERRIDE; |
| 140 virtual void setDeviceOrientationListener( | 140 virtual void setDeviceOrientationListener( |
| 141 WebKit::WebDeviceOrientationListener* listener) OVERRIDE; | 141 WebKit::WebDeviceOrientationListener* listener) OVERRIDE; |
| 142 virtual WebKit::WebCrypto* crypto() OVERRIDE; | 142 virtual WebKit::WebCrypto* crypto() OVERRIDE; |
| 143 virtual void queryStorageUsageAndQuota( | 143 virtual void queryStorageUsageAndQuota( |
| 144 const WebKit::WebURL& storage_partition, | 144 const WebKit::WebURL& storage_partition, |
| 145 WebKit::WebStorageQuotaType, | 145 WebKit::WebStorageQuotaType, |
| 146 WebKit::WebStorageQuotaCallbacks*) OVERRIDE; | 146 WebKit::WebStorageQuotaCallbacks*) OVERRIDE; |
| 147 | 147 |
| 148 #if defined(OS_ANDROID) | 148 virtual void vibrate(unsigned int milliseconds) OVERRIDE; |
|
Michael van Ouwerkerk
2013/11/08 14:41:07
Don't add OVERRIDE here. It is generally not used
ostap
2013/11/08 20:33:41
Done.
| |
| 149 virtual void vibrate(unsigned int milliseconds); | 149 virtual void cancelVibration() OVERRIDE; |
|
Michael van Ouwerkerk
2013/11/08 14:41:07
Also don't add OVERRIDE here.
ostap
2013/11/08 20:33:41
Done.
| |
| 150 virtual void cancelVibration(); | |
| 151 #endif // defined(OS_ANDROID) | |
| 152 | 150 |
| 153 // Disables the WebSandboxSupport implementation for testing. | 151 // Disables the WebSandboxSupport implementation for testing. |
| 154 // Tests that do not set up a full sandbox environment should call | 152 // Tests that do not set up a full sandbox environment should call |
| 155 // SetSandboxEnabledForTesting(false) _before_ creating any instances | 153 // SetSandboxEnabledForTesting(false) _before_ creating any instances |
| 156 // of this class, to ensure that we don't attempt to use sandbox-related | 154 // of this class, to ensure that we don't attempt to use sandbox-related |
| 157 // file descriptors or other resources. | 155 // file descriptors or other resources. |
| 158 // | 156 // |
| 159 // Returns the previous |enable| value. | 157 // Returns the previous |enable| value. |
| 160 static bool SetSandboxEnabledForTesting(bool enable); | 158 static bool SetSandboxEnabledForTesting(bool enable); |
| 161 | 159 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 scoped_refptr<QuotaMessageFilter> quota_message_filter_; | 206 scoped_refptr<QuotaMessageFilter> quota_message_filter_; |
| 209 | 207 |
| 210 webkit::WebCompositorSupportImpl compositor_support_; | 208 webkit::WebCompositorSupportImpl compositor_support_; |
| 211 | 209 |
| 212 scoped_ptr<WebCryptoImpl> web_crypto_; | 210 scoped_ptr<WebCryptoImpl> web_crypto_; |
| 213 }; | 211 }; |
| 214 | 212 |
| 215 } // namespace content | 213 } // namespace content |
| 216 | 214 |
| 217 #endif // CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ | 215 #endif // CONTENT_RENDERER_RENDERER_WEBKITPLATFORMSUPPORT_IMPL_H_ |
| OLD | NEW |