Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: webkit/api/src/MediaPlayerPrivateChromium.cpp

Issue 115482: Move WebMediaPlayerClientImpl files to WebKit API src location.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/api/public/WebKit.h ('k') | webkit/api/src/TemporaryGlue.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2008-2009 The Chromium Authors. All rights reserved. 1 /*
2 // Use of this source code is governed by a BSD-style license that can be 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 // found in the LICENSE file. 3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are
6 * met:
7 *
8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the
13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */
4 30
5 #include "config.h" 31 #include "config.h"
32 #include "MediaPlayerPrivateChromium.h"
6 33
7 #if ENABLE(VIDEO) 34 #if ENABLE(VIDEO)
8 35
9 #include "MediaPlayerPrivateChromium.h" 36 #include "WebMediaPlayerClientImpl.h"
10
11 #include "webkit/glue/webkit_glue.h"
12 #include "webkit/glue/webmediaplayerclient_impl.h"
13 37
14 namespace WebCore { 38 namespace WebCore {
15 39
16 void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar) { 40 void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
17 if (webkit_glue::IsMediaPlayerAvailable()) { 41 {
18 registrar(&WebMediaPlayerClientImpl::create, 42 WebKit::WebMediaPlayerClientImpl::registerSelf(registrar);
19 &WebMediaPlayerClientImpl::getSupportedTypes,
20 &WebMediaPlayerClientImpl::supportsType);
21 }
22 } 43 }
23 44
24 } // namespace WebCore 45 } // namespace WebCore
25 46
26 #endif 47 #endif
OLDNEW
« no previous file with comments | « webkit/api/public/WebKit.h ('k') | webkit/api/src/TemporaryGlue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698