| 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 WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 5 #ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 
| 6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 6 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 
| 7 | 7 | 
| 8 #include <string> | 8 #include <string> | 
| 9 | 9 | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 94     const WebKit::WebURL& url, | 94     const WebKit::WebURL& url, | 
| 95     WebKit::WebMediaPlayerClient* client, | 95     WebKit::WebMediaPlayerClient* client, | 
| 96     webkit_media::MediaStreamClient* media_stream_client); | 96     webkit_media::MediaStreamClient* media_stream_client); | 
| 97 | 97 | 
| 98 // This is used by WebFrameClient::createMediaPlayer(). | 98 // This is used by WebFrameClient::createMediaPlayer(). | 
| 99 WebKit::WebMediaPlayer* CreateMediaPlayer( | 99 WebKit::WebMediaPlayer* CreateMediaPlayer( | 
| 100     WebKit::WebFrame* frame, | 100     WebKit::WebFrame* frame, | 
| 101     const WebKit::WebURL& url, | 101     const WebKit::WebURL& url, | 
| 102     WebKit::WebMediaPlayerClient* client); | 102     WebKit::WebMediaPlayerClient* client); | 
| 103 | 103 | 
| 104 // DEPRECATED: Use ResetTestEnvironment() instead. |  | 
| 105 #if defined(OS_ANDROID) |  | 
| 106 void ReleaseMediaResources(); |  | 
| 107 #endif |  | 
| 108 |  | 
| 109 // This is used by WebFrameClient::createApplicationCacheHost(). | 104 // This is used by WebFrameClient::createApplicationCacheHost(). | 
| 110 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 105 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 
| 111     WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 106     WebKit::WebFrame* frame, WebKit::WebApplicationCacheHostClient* client); | 
| 112 | 107 | 
| 113 // This is used by WebViewHost::createSessionStorageNamespace(). | 108 // This is used by WebViewHost::createSessionStorageNamespace(). | 
| 114 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); | 109 WebKit::WebStorageNamespace* CreateSessionStorageNamespace(unsigned quota); | 
| 115 | 110 | 
| 116 // Returns the root directory of the WebKit code. | 111 // Returns the root directory of the WebKit code. | 
| 117 WebKit::WebString GetWebKitRootDir(); | 112 WebKit::WebString GetWebKitRootDir(); | 
| 118 | 113 | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 308 | 303 | 
| 309 void EnableWebCoreLogChannels(const std::string& channels); | 304 void EnableWebCoreLogChannels(const std::string& channels); | 
| 310 | 305 | 
| 311 // - Gamepad | 306 // - Gamepad | 
| 312 | 307 | 
| 313 void SetGamepadData(const WebKit::WebGamepads& pads); | 308 void SetGamepadData(const WebKit::WebGamepads& pads); | 
| 314 | 309 | 
| 315 }  // namespace webkit_support | 310 }  // namespace webkit_support | 
| 316 | 311 | 
| 317 #endif  // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 312 #endif  // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_ | 
| OLD | NEW | 
|---|