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

Unified Diff: content/renderer/media/android/media_info_loader.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/android/media_info_loader.h
diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h
index 067e5802f127f29d3bf9dc12f4169265bc5bbb57..b421fb3796b58bf36bc58ef279d3a0cf791d1c7f 100644
--- a/content/renderer/media/android/media_info_loader.h
+++ b/content/renderer/media/android/media_info_loader.h
@@ -59,7 +59,7 @@
const GURL& url,
blink::WebMediaPlayer::CORSMode cors_mode,
const ReadyCB& ready_cb);
- ~MediaInfoLoader() override;
+ virtual ~MediaInfoLoader();
// Start loading media info.
void Start(blink::WebFrame* frame);
@@ -80,25 +80,32 @@
blink::WebURLLoader* loader,
blink::WebURLRequest& newRequest,
const blink::WebURLResponse& redirectResponse);
- void didSendData(blink::WebURLLoader* loader,
- unsigned long long bytesSent,
- unsigned long long totalBytesToBeSent) override;
- void didReceiveResponse(blink::WebURLLoader* loader,
- const blink::WebURLResponse& response) override;
- void didDownloadData(blink::WebURLLoader* loader,
- int data_length,
- int encodedDataLength) override;
- void didReceiveData(blink::WebURLLoader* loader,
- const char* data,
- int data_length,
- int encoded_data_length) override;
- void didReceiveCachedMetadata(blink::WebURLLoader* loader,
- const char* data,
- int dataLength) override;
- void didFinishLoading(blink::WebURLLoader* loader,
- double finishTime,
- int64_t total_encoded_data_length) override;
- void didFail(blink::WebURLLoader* loader, const blink::WebURLError&) override;
+ virtual void didSendData(
+ blink::WebURLLoader* loader,
+ unsigned long long bytesSent,
+ unsigned long long totalBytesToBeSent);
+ virtual void didReceiveResponse(
+ blink::WebURLLoader* loader,
+ const blink::WebURLResponse& response);
+ virtual void didDownloadData(
+ blink::WebURLLoader* loader,
+ int data_length,
+ int encodedDataLength);
+ virtual void didReceiveData(
+ blink::WebURLLoader* loader,
+ const char* data,
+ int data_length,
+ int encoded_data_length);
+ virtual void didReceiveCachedMetadata(
+ blink::WebURLLoader* loader,
+ const char* data, int dataLength);
+ virtual void didFinishLoading(
+ blink::WebURLLoader* loader,
+ double finishTime,
+ int64_t total_encoded_data_length);
+ virtual void didFail(
+ blink::WebURLLoader* loader,
+ const blink::WebURLError&);
void DidBecomeReady(Status status);
« no previous file with comments | « content/ppapi_plugin/ppapi_blink_platform_impl.cc ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698