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

Unified Diff: content/app/android/child_process_service.cc

Issue 625263003: Replace OVERRIDE and FINAL with override and final in content/app/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/android/child_process_service.cc
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index 62c04d6623eb179a6d7b7103e614a97839042f46..6f11d7cf759a233430ff1a21a764e7b637d2dab9 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -53,7 +53,7 @@ class SurfaceTexturePeerChildImpl : public SurfaceTexturePeer,
base::ProcessHandle pid,
scoped_refptr<gfx::SurfaceTexture> surface_texture,
int primary_id,
- int secondary_id) OVERRIDE {
+ int secondary_id) override {
JNIEnv* env = base::android::AttachCurrentThread();
content::Java_ChildProcessService_establishSurfaceTexturePeer(
env, service_.obj(), pid,
@@ -63,7 +63,7 @@ class SurfaceTexturePeerChildImpl : public SurfaceTexturePeer,
}
// Overridden from GpuSurfaceLookup:
- virtual gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) OVERRIDE {
+ virtual gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override {
JNIEnv* env = base::android::AttachCurrentThread();
gfx::ScopedJavaSurface surface(
content::Java_ChildProcessService_getViewSurface(
@@ -85,7 +85,7 @@ class SurfaceTexturePeerChildImpl : public SurfaceTexturePeer,
// Overridden from SurfaceTextureLookup:
virtual gfx::AcceleratedWidget AcquireNativeWidget(int primary_id,
int secondary_id)
- OVERRIDE {
+ override {
JNIEnv* env = base::android::AttachCurrentThread();
gfx::ScopedJavaSurface surface(
content::Java_ChildProcessService_getSurfaceTextureSurface(
« no previous file with comments | « no previous file | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698