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/api/src/WebKit.cpp | |
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/api/src/WebKit.cpp')
-rw-r--r-- | webkit/api/src/WebKit.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp index 5523eba..163a3a3 100644 --- a/webkit/api/src/WebKit.cpp +++ b/webkit/api/src/WebKit.cpp @@ -1,10 +1,10 @@ /* * Copyright (C) 2009 Google Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above @@ -14,7 +14,7 @@ * * Neither the name of Google Inc. nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -31,6 +31,7 @@ #include "config.h" #include "WebKit.h" +#include "WebMediaPlayerClientImpl.h" #include "WebString.h" #include "AtomicString.h" @@ -112,6 +113,13 @@ void enableWebWorkers() #endif } +void enableMediaPlayer() +{ +#if ENABLE(VIDEO) + WebMediaPlayerClientImpl::setIsEnabled(true); +#endif +} + void resetPluginCache() { WebCore::Page::refreshPlugins(false); |