| 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 |
| (...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 925 else if (key == "WebKitUsesPageCachePreferenceKey") | 925 else if (key == "WebKitUsesPageCachePreferenceKey") |
| 926 preferences->uses_page_cache = CppVariantToBool(value); | 926 preferences->uses_page_cache = CppVariantToBool(value); |
| 927 else if (key == "WebKitXSSAuditorEnabled") | 927 else if (key == "WebKitXSSAuditorEnabled") |
| 928 preferences->xss_auditor_enabled = CppVariantToBool(value); | 928 preferences->xss_auditor_enabled = CppVariantToBool(value); |
| 929 else if (key == "WebKitLocalStorageEnabledPreferenceKey") | 929 else if (key == "WebKitLocalStorageEnabledPreferenceKey") |
| 930 preferences->local_storage_enabled = CppVariantToBool(value); | 930 preferences->local_storage_enabled = CppVariantToBool(value); |
| 931 else if (key == "WebKitOfflineWebApplicationCacheEnabled") | 931 else if (key == "WebKitOfflineWebApplicationCacheEnabled") |
| 932 preferences->application_cache_enabled = CppVariantToBool(value); | 932 preferences->application_cache_enabled = CppVariantToBool(value); |
| 933 else if (key == "WebKitTabToLinksPreferenceKey") | 933 else if (key == "WebKitTabToLinksPreferenceKey") |
| 934 preferences->tabs_to_links = CppVariantToBool(value); | 934 preferences->tabs_to_links = CppVariantToBool(value); |
| 935 else if (key == "WebKitWebSocketsEnabled") |
| 936 preferences->web_sockets_enabled = CppVariantToBool(value); |
| 935 else { | 937 else { |
| 936 std::string message("Invalid name for preference: "); | 938 std::string message("Invalid name for preference: "); |
| 937 message.append(key); | 939 message.append(key); |
| 938 LogErrorToConsole(message); | 940 LogErrorToConsole(message); |
| 939 } | 941 } |
| 940 preferences->Apply(shell_->webView()); | 942 preferences->Apply(shell_->webView()); |
| 941 } | 943 } |
| 942 result->SetNull(); | 944 result->SetNull(); |
| 943 } | 945 } |
| 944 | 946 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 setlocale(LC_ALL, new_locale.c_str()); | 987 setlocale(LC_ALL, new_locale.c_str()); |
| 986 } | 988 } |
| 987 } | 989 } |
| 988 | 990 |
| 989 void LayoutTestController::LogErrorToConsole(const std::string& text) { | 991 void LayoutTestController::LogErrorToConsole(const std::string& text) { |
| 990 shell_->delegate()->didAddMessageToConsole( | 992 shell_->delegate()->didAddMessageToConsole( |
| 991 WebConsoleMessage(WebConsoleMessage::LevelError, | 993 WebConsoleMessage(WebConsoleMessage::LevelError, |
| 992 WebString::fromUTF8(text)), | 994 WebString::fromUTF8(text)), |
| 993 WebString(), 0); | 995 WebString(), 0); |
| 994 } | 996 } |
| OLD | NEW |