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

Side by Side Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 10808089: Merge 146897 - WebMediaPlayerImpl needs to own the audio source provider. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 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/support/webkit_support.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // This file contains the implementation of TestWebViewDelegate, which serves 5 // This file contains the implementation of TestWebViewDelegate, which serves
6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to 6 // as the WebViewDelegate for the TestShellWebHost. The host is expected to
7 // have initialized a MessageLoop before these methods are called. 7 // have initialized a MessageLoop before these methods are called.
8 8
9 #include "webkit/tools/test_shell/test_webview_delegate.h" 9 #include "webkit/tools/test_shell/test_webview_delegate.h"
10 10
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 642
643 scoped_ptr<media::FilterCollection> collection( 643 scoped_ptr<media::FilterCollection> collection(
644 new media::FilterCollection()); 644 new media::FilterCollection());
645 645
646 return new webkit_media::WebMediaPlayerImpl( 646 return new webkit_media::WebMediaPlayerImpl(
647 frame, 647 frame,
648 client, 648 client,
649 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), 649 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
650 collection.release(), 650 collection.release(),
651 NULL, 651 NULL,
652 NULL,
652 message_loop_factory.release(), 653 message_loop_factory.release(),
653 NULL, 654 NULL,
654 new media::MediaLog()); 655 new media::MediaLog());
655 } 656 }
656 657
657 WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost( 658 WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost(
658 WebFrame* frame, WebApplicationCacheHostClient* client) { 659 WebFrame* frame, WebApplicationCacheHostClient* client) {
659 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); 660 return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
660 } 661 }
661 662
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 } 1153 }
1153 1154
1154 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) { 1155 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
1155 fake_rect_ = rect; 1156 fake_rect_ = rect;
1156 using_fake_rect_ = true; 1157 using_fake_rect_ = true;
1157 } 1158 }
1158 1159
1159 WebRect TestWebViewDelegate::fake_window_rect() { 1160 WebRect TestWebViewDelegate::fake_window_rect() {
1160 return fake_rect_; 1161 return fake_rect_;
1161 } 1162 }
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698