diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 22:37:21 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 22:37:21 +0000 |
commit | b08eebe85809832b301e8e7c22c9165179b79293 (patch) | |
tree | 0de69357c4a6a43e9a16a828a74969e3d753df21 /webkit/tools/test_shell | |
parent | f58ddcfcb2ab175a15813d1e65cf1a5a9e0340d5 (diff) | |
download | chromium_src-b08eebe85809832b301e8e7c22c9165179b79293.zip chromium_src-b08eebe85809832b301e8e7c22c9165179b79293.tar.gz chromium_src-b08eebe85809832b301e8e7c22c9165179b79293.tar.bz2 |
Move WebMediaPlayerClientImpl files to WebKit API src location.
This involves adding a temporary glue function, which will be
removed once WebFrame / WebView are part of the WebKit API.
R=hclam
Review URL: http://codereview.chromium.org/115482
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 12 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 5 |
2 files changed, 1 insertions, 16 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 085537e..1a81225 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -400,7 +400,7 @@ void TestShell::ResetWebPreferences() { web_prefs_->text_areas_are_resizable = false; web_prefs_->java_enabled = true; web_prefs_->allow_scripts_to_close_windows = false; - // It's off by default for Chrome, but we don't want to + // It's off by default for Chrome, but we don't want to // lose the coverage of dynamic font tests in webkit test. web_prefs_->remote_fonts_enabled = true; } @@ -589,16 +589,6 @@ void TestShell::SetFocus(WebWidgetHost* host, bool enable) { namespace webkit_glue { -static bool g_media_player_available = false; - -void SetMediaPlayerAvailable(bool value) { - g_media_player_available = value; -} - -bool IsMediaPlayerAvailable() { - return g_media_player_available; -} - void PrecacheUrl(const char16* url, int url_length) {} void AppendToLog(const char* file, int line, const char* msg) { diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 166fcae..daa3791 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -238,11 +238,6 @@ int main(int argc, char* argv[]) { base::MemoryDebug::DumpAllMemoryInUse(); } - if (false) { - // TODO(scherkus): check for any DLL dependencies. - webkit_glue::SetMediaPlayerAvailable(true); - } - // See if we need to run the tests. if (layout_test_mode) { // Set up for the kind of test requested. |