replace OVERRIDE and FINAL with override and final in ui/

ui/views/controls/textfield/textfield_model.cc

 // Copyright 2014 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.
 
 #include "ui/views/controls/textfield/textfield_model.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 142 matching lines @@
              at  /* old cursor */,
              base::string16(),
              at,
              false  /* N/A */,
              at + new_text.length()  /* new cursor */,
              new_text,
              at) {
   }
 
   // Edit implementation.
-  virtual bool DoMerge(const Edit* edit) OVERRIDE {
+  virtual bool DoMerge(const Edit* edit) override {
     if (edit->type() != INSERT_EDIT || new_text_end() != edit->new_text_start_)
       return false;
     // If continuous edit, merge it.
     // TODO(oshima): gtk splits edits between whitespace. Find out what
     // we want to here and implement if necessary.
     new_text_ += edit->new_text_;
     new_cursor_pos_ = edit->new_cursor_pos_;
     return true;
   }
 };
@@ skipping 12 matching lines @@
              old_cursor_pos,
              old_text,
              old_text_start,
              backward,
              new_cursor_pos,
              new_text,
              new_text_start) {
   }
 
   // Edit implementation.
-  virtual bool DoMerge(const Edit* edit) OVERRIDE {
+  virtual bool DoMerge(const Edit* edit) override {
     if (edit->type() == DELETE_EDIT ||
         new_text_end() != edit->old_text_start_ ||
         edit->old_text_start_ != edit->new_text_start_)
       return false;
     old_text_ += edit->old_text_;
     new_text_ += edit->new_text_;
     new_cursor_pos_ = edit->new_cursor_pos_;
     return true;
   }
 };
 
 class DeleteEdit : public Edit {
  public:
   DeleteEdit(bool mergeable,
              const base::string16& text,
              size_t text_start,
              bool backward)
       : Edit(DELETE_EDIT,
              mergeable ? MERGEABLE : DO_NOT_MERGE,
              (backward ? text_start + text.length() : text_start),
              text,
              text_start,
              backward,
              text_start,
              base::string16(),
              text_start) {
   }
 
   // Edit implementation.
-  virtual bool DoMerge(const Edit* edit) OVERRIDE {
+  virtual bool DoMerge(const Edit* edit) override {
     if (edit->type() != DELETE_EDIT)
       return false;
 
     if (delete_backward_) {
       // backspace can be merged only with backspace at the same position.
       if (!edit->delete_backward_ || old_text_start_ != edit->old_text_end())
         return false;
       old_text_start_ = edit->old_text_start_;
       old_text_ = edit->old_text_ + old_text_;
       new_cursor_pos_ = edit->new_cursor_pos_;
@@ skipping 523 matching lines @@
   ClearComposition();
   if (delete_from != delete_to)
     render_text_->SetText(old_text.erase(delete_from, delete_to - delete_from));
   if (!new_text.empty())
     render_text_->SetText(old_text.insert(new_text_insert_at, new_text));
   render_text_->SetCursorPosition(new_cursor_pos);
   // TODO(oshima): Select text that was just undone, like Mac (but not GTK).
 }
 
 }  // namespace views