| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 // TestWebViewDelegate class: | 5 // TestWebViewDelegate class: |
| 6 // This class implements the WebViewDelegate methods for the test shell. One | 6 // This class implements the WebViewDelegate methods for the test shell. One |
| 7 // instance is owned by each TestShell. | 7 // instance is owned by each TestShell. |
| 8 | 8 |
| 9 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ | 9 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ |
| 10 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ | 10 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 virtual void willSendRequest( | 217 virtual void willSendRequest( |
| 218 WebKit::WebFrame*, unsigned identifier, WebKit::WebURLRequest&, | 218 WebKit::WebFrame*, unsigned identifier, WebKit::WebURLRequest&, |
| 219 const WebKit::WebURLResponse& redirectResponse); | 219 const WebKit::WebURLResponse& redirectResponse); |
| 220 virtual void didReceiveResponse( | 220 virtual void didReceiveResponse( |
| 221 WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLResponse&); | 221 WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLResponse&); |
| 222 virtual void didFinishResourceLoad( | 222 virtual void didFinishResourceLoad( |
| 223 WebKit::WebFrame*, unsigned identifier); | 223 WebKit::WebFrame*, unsigned identifier); |
| 224 virtual void didFailResourceLoad( | 224 virtual void didFailResourceLoad( |
| 225 WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLError&); | 225 WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLError&); |
| 226 virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); | 226 virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); |
| 227 |
| 228 // We have two didRunInsecureContent's with the same name. That's because |
| 229 // we're in the process of adding an argument and one of them will be correct. |
| 230 // Once the WebKit change is in, the first should be removed the the second |
| 231 // should be tagged with OVERRIDE. |
| 232 virtual void didRunInsecureContent( |
| 233 WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin); |
| 227 virtual void didRunInsecureContent( | 234 virtual void didRunInsecureContent( |
| 228 WebKit::WebFrame* frame, | 235 WebKit::WebFrame* frame, |
| 229 const WebKit::WebSecurityOrigin& origin) OVERRIDE; | 236 const WebKit::WebSecurityOrigin& origin); |
| 237 |
| 230 virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings); | 238 virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings); |
| 231 virtual void openFileSystem( | 239 virtual void openFileSystem( |
| 232 WebKit::WebFrame* frame, | 240 WebKit::WebFrame* frame, |
| 233 WebKit::WebFileSystem::Type type, | 241 WebKit::WebFileSystem::Type type, |
| 234 long long size, | 242 long long size, |
| 235 bool create, | 243 bool create, |
| 236 WebKit::WebFileSystemCallbacks* callbacks); | 244 WebKit::WebFileSystemCallbacks* callbacks); |
| 237 | 245 |
| 238 // webkit::npapi::WebPluginPageDelegate | 246 // webkit::npapi::WebPluginPageDelegate |
| 239 virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( | 247 virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 std::string edit_command_name_; | 459 std::string edit_command_name_; |
| 452 std::string edit_command_value_; | 460 std::string edit_command_value_; |
| 453 | 461 |
| 454 // The mock spellchecker used in TestWebViewDelegate::spellCheck(). | 462 // The mock spellchecker used in TestWebViewDelegate::spellCheck(). |
| 455 MockSpellCheck mock_spellcheck_; | 463 MockSpellCheck mock_spellcheck_; |
| 456 | 464 |
| 457 DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate); | 465 DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate); |
| 458 }; | 466 }; |
| 459 | 467 |
| 460 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ | 468 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_ |
| OLD | NEW |