Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery…

content/browser/accessibility/browser_accessibility_manager_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_ANDROID_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/android/content_view_core_impl.h"
@@ skipping 16 matching lines @@
 
   virtual ~BrowserAccessibilityManagerAndroid();
 
   static ui::AXTreeUpdate GetEmptyDocument();
 
   void SetContentViewCore(
       base::android::ScopedJavaLocalRef<jobject> content_view_core);
 
   // Implementation of BrowserAccessibilityManager.
   virtual void NotifyAccessibilityEvent(
-      ui::AXEvent event_type, BrowserAccessibility* node) OVERRIDE;
+      ui::AXEvent event_type, BrowserAccessibility* node) override;
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   // Tree methods.
   jint GetRootId(JNIEnv* env, jobject obj);
   jboolean IsNodeValid(JNIEnv* env, jobject obj, jint id);
   void HitTest(JNIEnv* env, jobject obj, jint x, jint y);
 
@@ skipping 12 matching lines @@
   // Return the id of the next node in tree order in the direction given by
   // |forwards|, starting with |start_id|, that matches |element_type|,
   // where |element_type| is a special uppercase string from TalkBack or
   // BrailleBack indicating general categories of web content like
   // "SECTION" or "CONTROL".  Return 0 if not found.
   jint FindElementType(JNIEnv* env, jobject obj, jint start_id,
                        jstring element_type, jboolean forwards);
 
  protected:
   // AXTreeDelegate overrides.
-  virtual void OnRootChanged(ui::AXNode* new_root) OVERRIDE;
+  virtual void OnRootChanged(ui::AXNode* new_root) override;
 
-  virtual bool UseRootScrollOffsetsWhenComputingBounds() OVERRIDE;
+  virtual bool UseRootScrollOffsetsWhenComputingBounds() override;
 
  private:
   // This gives BrowserAccessibilityManager::Create access to the class
   // constructor.
   friend class BrowserAccessibilityManager;
 
   // A weak reference to the Java BrowserAccessibilityManager object.
   // This avoids adding another reference to BrowserAccessibilityManager and
   // preventing garbage collection.
   // Premature garbage collection is prevented by the long-lived reference in
   // ContentViewCore.
   JavaObjectWeakGlobalRef java_ref_;
 
   // Handle a hover event from the renderer process.
   void HandleHoverEvent(BrowserAccessibility* node);
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerAndroid);
 };
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env);
 
 }
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_ANDROID_H_