Index: webkit/api/src/MediaPlayerPrivateChromium.cpp |
=================================================================== |
--- webkit/api/src/MediaPlayerPrivateChromium.cpp (revision 16276) |
+++ webkit/api/src/MediaPlayerPrivateChromium.cpp (working copy) |
@@ -1,26 +1,47 @@ |
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
+/* |
+ * 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 |
+ * copyright notice, this list of conditions and the following disclaimer |
+ * in the documentation and/or other materials provided with the |
+ * distribution. |
+ * * 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 |
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+ */ |
#include "config.h" |
+#include "MediaPlayerPrivateChromium.h" |
#if ENABLE(VIDEO) |
-#include "MediaPlayerPrivateChromium.h" |
+#include "WebMediaPlayerClientImpl.h" |
-#include "webkit/glue/webkit_glue.h" |
-#include "webkit/glue/webmediaplayerclient_impl.h" |
- |
namespace WebCore { |
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar) { |
- if (webkit_glue::IsMediaPlayerAvailable()) { |
- registrar(&WebMediaPlayerClientImpl::create, |
- &WebMediaPlayerClientImpl::getSupportedTypes, |
- &WebMediaPlayerClientImpl::supportsType); |
- } |
+void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar) |
+{ |
+ WebKit::WebMediaPlayerClientImpl::registerSelf(registrar); |
} |
-} // namespace WebCore |
+} // namespace WebCore |
#endif |