| 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 #undef LOG | 5 #undef LOG |
| 6 | 6 |
| 7 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" | 55 #include "webkit/tools/test_shell/test_shell_devtools_agent.h" |
| 56 #include "webkit/tools/test_shell/test_shell_devtools_client.h" | 56 #include "webkit/tools/test_shell/test_shell_devtools_client.h" |
| 57 #include "webkit/tools/test_shell/test_shell_request_context.h" | 57 #include "webkit/tools/test_shell/test_shell_request_context.h" |
| 58 #include "webkit/tools/test_shell/test_shell_switches.h" | 58 #include "webkit/tools/test_shell/test_shell_switches.h" |
| 59 #include "webkit/tools/test_shell/test_webview_delegate.h" | 59 #include "webkit/tools/test_shell/test_webview_delegate.h" |
| 60 | 60 |
| 61 #if defined(ENABLE_CLIENT_BASED_GEOLOCATION) | 61 #if defined(ENABLE_CLIENT_BASED_GEOLOCATION) |
| 62 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" | 62 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h" |
| 63 #endif | 63 #endif |
| 64 | 64 |
| 65 #if defined(OS_MACOSX) | |
| 66 #include "base/mac_util.h" | |
| 67 #endif | |
| 68 | |
| 69 using WebKit::WebCanvas; | 65 using WebKit::WebCanvas; |
| 70 using WebKit::WebFrame; | 66 using WebKit::WebFrame; |
| 71 using WebKit::WebNavigationPolicy; | 67 using WebKit::WebNavigationPolicy; |
| 72 using WebKit::WebRect; | 68 using WebKit::WebRect; |
| 73 using WebKit::WebScriptController; | 69 using WebKit::WebScriptController; |
| 74 using WebKit::WebSize; | 70 using WebKit::WebSize; |
| 75 using WebKit::WebURLRequest; | 71 using WebKit::WebURLRequest; |
| 76 using WebKit::WebView; | 72 using WebKit::WebView; |
| 77 | 73 |
| 78 namespace { | 74 namespace { |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 913 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
| 918 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 914 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
| 919 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 915 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
| 920 plugins->erase(plugins->begin() + i); | 916 plugins->erase(plugins->begin() + i); |
| 921 } | 917 } |
| 922 } | 918 } |
| 923 } | 919 } |
| 924 } | 920 } |
| 925 | 921 |
| 926 } // namespace webkit_glue | 922 } // namespace webkit_glue |
| OLD | NEW |