| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 // This file contains the definition for LayoutTestController. | 5 // This file contains the definition for LayoutTestController. |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "webkit/tools/test_shell/layout_test_controller.h" | 9 #include "webkit/tools/test_shell/layout_test_controller.h" |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
| 15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
| 16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 17 #include "webkit/api/public/WebConsoleMessage.h" | 17 #include "webkit/api/public/WebConsoleMessage.h" |
| 18 #include "webkit/api/public/WebFrame.h" | 18 #include "webkit/api/public/WebFrame.h" |
| 19 #include "webkit/api/public/WebKit.h" | 19 #include "webkit/api/public/WebKit.h" |
| 20 #include "webkit/api/public/WebScriptSource.h" | 20 #include "webkit/api/public/WebScriptSource.h" |
| 21 #include "webkit/api/public/WebURL.h" | 21 #include "webkit/api/public/WebURL.h" |
| 22 #include "webkit/api/public/WebView.h" |
| 22 #include "webkit/glue/dom_operations.h" | 23 #include "webkit/glue/dom_operations.h" |
| 23 #include "webkit/glue/webpreferences.h" | 24 #include "webkit/glue/webpreferences.h" |
| 24 #include "webkit/glue/webview.h" | |
| 25 #include "webkit/tools/test_shell/simple_database_system.h" | 25 #include "webkit/tools/test_shell/simple_database_system.h" |
| 26 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" | 26 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" |
| 27 #include "webkit/tools/test_shell/test_navigation_controller.h" | 27 #include "webkit/tools/test_shell/test_navigation_controller.h" |
| 28 #include "webkit/tools/test_shell/test_shell.h" | 28 #include "webkit/tools/test_shell/test_shell.h" |
| 29 | 29 |
| 30 using std::string; | 30 using std::string; |
| 31 using std::wstring; | 31 using std::wstring; |
| 32 | 32 |
| 33 using WebKit::WebConsoleMessage; | 33 using WebKit::WebConsoleMessage; |
| 34 using WebKit::WebScriptSource; | 34 using WebKit::WebScriptSource; |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 setlocale(LC_ALL, new_locale.c_str()); | 985 setlocale(LC_ALL, new_locale.c_str()); |
| 986 } | 986 } |
| 987 } | 987 } |
| 988 | 988 |
| 989 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 989 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
| 990 shell_->delegate()->didAddMessageToConsole( | 990 shell_->delegate()->didAddMessageToConsole( |
| 991 WebConsoleMessage(WebConsoleMessage::LevelError, | 991 WebConsoleMessage(WebConsoleMessage::LevelError, |
| 992 WebString::fromUTF8(text)), | 992 WebString::fromUTF8(text)), |
| 993 WebString(), 0); | 993 WebString(), 0); |
| 994 } | 994 } |
| OLD | NEW |