| 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_SHELL_WEBKIT_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, | 49 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
| 50 bool is_new_navigation) OVERRIDE; | 50 bool is_new_navigation) OVERRIDE; |
| 51 virtual void DidFailProvisionalLoad( | 51 virtual void DidFailProvisionalLoad( |
| 52 WebKit::WebFrame* frame, const WebKit::WebURLError& error) OVERRIDE; | 52 WebKit::WebFrame* frame, const WebKit::WebURLError& error) OVERRIDE; |
| 53 | 53 |
| 54 // WebTestDelegate implementation. | 54 // WebTestDelegate implementation. |
| 55 virtual void clearEditCommand(); | 55 virtual void clearEditCommand(); |
| 56 virtual void setEditCommand(const std::string& name, | 56 virtual void setEditCommand(const std::string& name, |
| 57 const std::string& value); | 57 const std::string& value); |
| 58 virtual void setGamepadData(const WebKit::WebGamepads& gamepads); | 58 virtual void setGamepadData(const WebKit::WebGamepads& gamepads); |
| 59 virtual void setDeviceMotionListener( |
| 60 WebKit::WebDeviceMotionListener* listener) OVERRIDE; |
| 59 virtual void printMessage(const std::string& message); | 61 virtual void printMessage(const std::string& message); |
| 60 virtual void postTask(::WebTestRunner::WebTask* task); | 62 virtual void postTask(::WebTestRunner::WebTask* task); |
| 61 virtual void postDelayedTask(::WebTestRunner::WebTask* task, | 63 virtual void postDelayedTask(::WebTestRunner::WebTask* task, |
| 62 long long ms); | 64 long long ms); |
| 63 virtual WebKit::WebString registerIsolatedFileSystem( | 65 virtual WebKit::WebString registerIsolatedFileSystem( |
| 64 const WebKit::WebVector<WebKit::WebString>& absolute_filenames); | 66 const WebKit::WebVector<WebKit::WebString>& absolute_filenames); |
| 65 virtual long long getCurrentTimeInMillisecond(); | 67 virtual long long getCurrentTimeInMillisecond(); |
| 66 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path( | 68 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path( |
| 67 const std::string& utf8_path); | 69 const std::string& utf8_path); |
| 68 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL& file_url); | 70 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL& file_url); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 bool focus_on_next_commit_; | 139 bool focus_on_next_commit_; |
| 138 | 140 |
| 139 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_; | 141 scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_; |
| 140 | 142 |
| 141 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); | 143 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); |
| 142 }; | 144 }; |
| 143 | 145 |
| 144 } // namespace content | 146 } // namespace content |
| 145 | 147 |
| 146 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ | 148 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ |
| OLD | NEW |