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

Side by Side Diff: public/testing/WebTestProxy.h

Issue 18130006: Remove WebTestProxy override of WebFrameClient::createMediaPlayer(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 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 | « public/testing/WebTestDelegate.h ('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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 class WebColorChooser; 56 class WebColorChooser;
57 class WebColorChooserClient; 57 class WebColorChooserClient;
58 class WebDataSource; 58 class WebDataSource;
59 class WebDeviceOrientationClient; 59 class WebDeviceOrientationClient;
60 class WebDeviceOrientationClientMock; 60 class WebDeviceOrientationClientMock;
61 class WebDragData; 61 class WebDragData;
62 class WebFrame; 62 class WebFrame;
63 class WebGeolocationClient; 63 class WebGeolocationClient;
64 class WebGeolocationClientMock; 64 class WebGeolocationClientMock;
65 class WebImage; 65 class WebImage;
66 class WebMediaPlayer;
67 class WebMediaPlayerClient;
68 class WebMIDIAccessor; 66 class WebMIDIAccessor;
69 class WebMIDIAccessorClient; 67 class WebMIDIAccessorClient;
70 class WebNode; 68 class WebNode;
71 class WebNotificationPresenter; 69 class WebNotificationPresenter;
72 class WebPlugin; 70 class WebPlugin;
73 class WebRange; 71 class WebRange;
74 class WebSerializedScriptValue; 72 class WebSerializedScriptValue;
75 class WebSpeechInputController; 73 class WebSpeechInputController;
76 class WebSpeechInputListener; 74 class WebSpeechInputListener;
77 class WebSpeechRecognizer; 75 class WebSpeechRecognizer;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 void didBeginEditing(); 163 void didBeginEditing();
166 void didChangeSelection(bool isEmptySelection); 164 void didChangeSelection(bool isEmptySelection);
167 void didChangeContents(); 165 void didChangeContents();
168 void didEndEditing(); 166 void didEndEditing();
169 bool createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest&, con st WebKit::WebWindowFeatures&, const WebKit::WebString& frameName, WebKit::WebNa vigationPolicy); 167 bool createView(WebKit::WebFrame* creator, const WebKit::WebURLRequest&, con st WebKit::WebWindowFeatures&, const WebKit::WebString& frameName, WebKit::WebNa vigationPolicy);
170 WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginPa rams&); 168 WebKit::WebPlugin* createPlugin(WebKit::WebFrame*, const WebKit::WebPluginPa rams&);
171 void setStatusText(const WebKit::WebString&); 169 void setStatusText(const WebKit::WebString&);
172 void didStopLoading(); 170 void didStopLoading();
173 void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&); 171 void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&);
174 WebKit::WebUserMediaClient* userMediaClient(); 172 WebKit::WebUserMediaClient* userMediaClient();
175 WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame*, const WebKit::W ebURL&, WebKit::WebMediaPlayerClient*);
176 void printPage(WebKit::WebFrame*); 173 void printPage(WebKit::WebFrame*);
177 WebKit::WebNotificationPresenter* notificationPresenter(); 174 WebKit::WebNotificationPresenter* notificationPresenter();
178 WebKit::WebGeolocationClient* geolocationClient(); 175 WebKit::WebGeolocationClient* geolocationClient();
179 WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInp utListener*); 176 WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInp utListener*);
180 WebKit::WebSpeechRecognizer* speechRecognizer(); 177 WebKit::WebSpeechRecognizer* speechRecognizer();
181 WebKit::WebDeviceOrientationClient* deviceOrientationClient(); 178 WebKit::WebDeviceOrientationClient* deviceOrientationClient();
182 bool requestPointerLock(); 179 bool requestPointerLock();
183 void requestPointerUnlock(); 180 void requestPointerUnlock();
184 bool isPointerLocked(); 181 bool isPointerLocked();
185 void didFocus(); 182 void didFocus();
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 } 396 }
400 virtual void showContextMenu(WebKit::WebFrame* frame, const WebKit::WebConte xtMenuData& contextMenuData) 397 virtual void showContextMenu(WebKit::WebFrame* frame, const WebKit::WebConte xtMenuData& contextMenuData)
401 { 398 {
402 WebTestProxyBase::showContextMenu(frame, contextMenuData); 399 WebTestProxyBase::showContextMenu(frame, contextMenuData);
403 Base::showContextMenu(frame, contextMenuData); 400 Base::showContextMenu(frame, contextMenuData);
404 } 401 }
405 virtual WebKit::WebUserMediaClient* userMediaClient() 402 virtual WebKit::WebUserMediaClient* userMediaClient()
406 { 403 {
407 return WebTestProxyBase::userMediaClient(); 404 return WebTestProxyBase::userMediaClient();
408 } 405 }
409 virtual WebKit::WebMediaPlayer* createMediaPlayer(WebKit::WebFrame* frame, c onst WebKit::WebURL& url, WebKit::WebMediaPlayerClient* client)
410 {
411 return WebTestProxyBase::createMediaPlayer(frame, url, client);
412 }
413 virtual void printPage(WebKit::WebFrame* frame) 406 virtual void printPage(WebKit::WebFrame* frame)
414 { 407 {
415 WebTestProxyBase::printPage(frame); 408 WebTestProxyBase::printPage(frame);
416 } 409 }
417 virtual WebKit::WebNotificationPresenter* notificationPresenter() 410 virtual WebKit::WebNotificationPresenter* notificationPresenter()
418 { 411 {
419 return WebTestProxyBase::notificationPresenter(); 412 return WebTestProxyBase::notificationPresenter();
420 } 413 }
421 virtual WebKit::WebGeolocationClient* geolocationClient() 414 virtual WebKit::WebGeolocationClient* geolocationClient()
422 { 415 {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 } 626 }
634 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC lient* client, const WebKit::WebColor& color) 627 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC lient* client, const WebKit::WebColor& color)
635 { 628 {
636 return WebTestProxyBase::createColorChooser(client, color); 629 return WebTestProxyBase::createColorChooser(client, color);
637 } 630 }
638 }; 631 };
639 632
640 } 633 }
641 634
642 #endif // WebTestProxy_h 635 #endif // WebTestProxy_h
OLDNEW
« no previous file with comments | « public/testing/WebTestDelegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698