Linux/ChromeOS Chromium style checker cleanup, ui/ edition.

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047

Review URL: https://chromiumcodereview.appspot.com/12217031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180955 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 86 insertions, 77 deletions

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 4d27b50..ea32fd0 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -67,7 +67,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {
   virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
   virtual bool HasHitTestMask() const OVERRIDE { return false; }
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
-  scoped_refptr<ui::Texture> CopyTexture() {
+  virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE {
     return scoped_refptr<ui::Texture>();
   }
 
diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc
index 268958b..fe05133 100644
--- a/ui/aura/test/event_generator.cc
+++ b/ui/aura/test/event_generator.cc
@@ -33,11 +33,11 @@ class DefaultEventGeneratorDelegate : public EventGeneratorDelegate {
   virtual ~DefaultEventGeneratorDelegate() {}
 
   // EventGeneratorDelegate overrides:
-  RootWindow* GetRootWindowAt(const gfx::Point& point) const OVERRIDE {
+  virtual RootWindow* GetRootWindowAt(const gfx::Point& point) const OVERRIDE {
     return root_window_;
   }
 
-  client::ScreenPositionClient* GetScreenPositionClient(
+  virtual client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const OVERRIDE {
     return NULL;
   }
diff --git a/ui/base/events/event_dispatcher_unittest.cc b/ui/base/events/event_dispatcher_unittest.cc
index 4b61cb4..976012a 100644
--- a/ui/base/events/event_dispatcher_unittest.cc
+++ b/ui/base/events/event_dispatcher_unittest.cc
@@ -150,7 +150,7 @@ class InvalidateTargetEventHandler : public TestEventHandler {
   virtual ~InvalidateTargetEventHandler() {}
 
  private:
-  virtual void ReceivedEvent(Event* event) {
+  virtual void ReceivedEvent(Event* event) OVERRIDE {
    TestEventHandler::ReceivedEvent(event);
    TestTarget* target = static_cast<TestTarget*>(event->target());
    target->set_valid(false);
@@ -178,7 +178,7 @@ class EventHandlerDestroyer : public TestEventHandler {
   }
 
  private:
-  virtual void ReceivedEvent(Event* event) {
+  virtual void ReceivedEvent(Event* event) OVERRIDE {
     TestEventHandler::ReceivedEvent(event);
     delete to_destroy_;
     to_destroy_ = NULL;
diff --git a/ui/base/gtk/gtk_expanded_container_unittest.cc b/ui/base/gtk/gtk_expanded_container_unittest.cc
index 99bcad3..532e58e 100644
--- a/ui/base/gtk/gtk_expanded_container_unittest.cc
+++ b/ui/base/gtk/gtk_expanded_container_unittest.cc
@@ -31,7 +31,7 @@ class GtkExpandedContainerTest : public testing::Test {
     gtk_window_set_default_size(GTK_WINDOW(window_), 200, 200);
     gtk_container_add(GTK_CONTAINER(window_), expanded_);
   }
-  ~GtkExpandedContainerTest() {
+  virtual ~GtkExpandedContainerTest() {
     gtk_widget_destroy(window_);
   }
 
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
index a94d8d4..c93d117 100644
--- a/ui/compositor/layer_animator_unittest.cc
+++ b/ui/compositor/layer_animator_unittest.cc
@@ -85,13 +85,18 @@ class DeletingLayerAnimationObserver : public LayerAnimationObserver {
       sequence_(sequence) {
   }
 
-  virtual void OnLayerAnimationEnded(LayerAnimationSequence* sequence) {
+  virtual void OnLayerAnimationEnded(
+      LayerAnimationSequence* sequence) OVERRIDE {
     animator_->StopAnimating();
   }
 
-  virtual void OnLayerAnimationAborted(LayerAnimationSequence* sequence) {}
+  virtual void OnLayerAnimationAborted(
+      LayerAnimationSequence* sequence) OVERRIDE {
+  }
 
-  virtual void OnLayerAnimationScheduled(LayerAnimationSequence* sequence) {}
+  virtual void OnLayerAnimationScheduled(
+      LayerAnimationSequence* sequence) OVERRIDE {
+  }
 
  private:
   LayerAnimator* animator_;
@@ -1568,7 +1573,7 @@ public:
     animator()->AddObserver(this);
   }
 
-  ~DeletingObserver() {
+  virtual ~DeletingObserver() {
     animator()->RemoveObserver(this);
     *was_deleted_ = true;
   }
@@ -1610,7 +1615,7 @@ public:
   }
 
   virtual void OnLayerAnimationScheduled(
-      LayerAnimationSequence* sequence) {
+      LayerAnimationSequence* sequence) OVERRIDE {
     if (delete_on_animation_scheduled_)
       delete this;
   }
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 011ad89..c87e07b 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -578,7 +578,7 @@ class LayerWithNullDelegateTest : public LayerWithDelegateTest {
   virtual void TearDown() OVERRIDE {
   }
 
-  Layer* CreateLayer(LayerType type) OVERRIDE {
+  virtual Layer* CreateLayer(LayerType type) OVERRIDE {
     Layer* layer = new Layer(type);
     layer->set_delegate(default_layer_delegate_.get());
     return layer;
@@ -596,7 +596,7 @@ class LayerWithNullDelegateTest : public LayerWithDelegateTest {
     return layer;
   }
 
-  Layer* CreateNoTextureLayer(const gfx::Rect& bounds) OVERRIDE {
+  virtual Layer* CreateNoTextureLayer(const gfx::Rect& bounds) OVERRIDE {
     Layer* layer = CreateLayer(LAYER_NOT_DRAWN);
     layer->SetBounds(bounds);
     return layer;
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index ac846c6..63e2fab 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -47,7 +47,7 @@ class EGLSyncControlVSyncProvider
  protected:
   virtual bool GetSyncValues(int64* system_time,
                              int64* media_stream_counter,
-                             int64* swap_buffer_counter) {
+                             int64* swap_buffer_counter) OVERRIDE {
     uint64 u_system_time, u_media_stream_counter, u_swap_buffer_counter;
     bool result = eglGetSyncValuesCHROMIUM(
         g_display, surface_, &u_system_time,
@@ -60,7 +60,7 @@ class EGLSyncControlVSyncProvider
     return result;
   }
 
-  virtual bool GetMscRate(int32* numerator, int32* denominator) {
+  virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE {
     return false;
   }
 
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 5da0191..0a49791 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -67,12 +67,12 @@ class OMLSyncControlVSyncProvider
  protected:
   virtual bool GetSyncValues(int64* system_time,
                              int64* media_stream_counter,
-                             int64* swap_buffer_counter) {
+                             int64* swap_buffer_counter) OVERRIDE {
     return glXGetSyncValuesOML(g_display, window_, system_time,
                                media_stream_counter, swap_buffer_counter);
   }
 
-  virtual bool GetMscRate(int32* numerator, int32* denominator) {
+  virtual bool GetMscRate(int32* numerator, int32* denominator) OVERRIDE {
     if (!g_glx_get_msc_rate_oml_supported)
       return false;
 
@@ -112,7 +112,7 @@ class SGIVideoSyncThread
     DCHECK(CalledOnValidThread());
   }
 
-  ~SGIVideoSyncThread() {
+  virtual ~SGIVideoSyncThread() {
     DCHECK(CalledOnValidThread());
     g_video_sync_thread = NULL;
     Stop();
diff --git a/ui/message_center/message_center_tray_unittest.cc b/ui/message_center/message_center_tray_unittest.cc
index 24a83e5..e3fa107 100644
--- a/ui/message_center/message_center_tray_unittest.cc
+++ b/ui/message_center/message_center_tray_unittest.cc
@@ -18,17 +18,17 @@ class MockDelegate : public MessageCenterTrayDelegate {
       : show_popups_success_(true),
         show_message_center_success_(true) {}
   virtual ~MockDelegate() {}
-  virtual void OnMessageCenterTrayChanged() {}
-  virtual bool ShowPopups() {
+  virtual void OnMessageCenterTrayChanged() OVERRIDE {}
+  virtual bool ShowPopups() OVERRIDE {
     return show_message_center_success_;
   }
-  virtual void HidePopups() {}
-  virtual void UpdatePopups() {}
-  virtual bool ShowMessageCenter() {
+  virtual void HidePopups() OVERRIDE {}
+  virtual void UpdatePopups() OVERRIDE {}
+  virtual bool ShowMessageCenter() OVERRIDE {
     return show_popups_success_;
   }
-  virtual void HideMessageCenter() {}
-  virtual void UpdateMessageCenter() {}
+  virtual void HideMessageCenter() OVERRIDE {}
+  virtual void UpdateMessageCenter() OVERRIDE {}
 
   bool show_popups_success_;
   bool show_message_center_success_;
diff --git a/ui/message_center/notifier_settings.cc b/ui/message_center/notifier_settings.cc
index 138b068..0070d56 100644
--- a/ui/message_center/notifier_settings.cc
+++ b/ui/message_center/notifier_settings.cc
@@ -86,7 +86,8 @@ class NotifierSettingsView::NotifierButton : public views::CustomButton,
 
  private:
   // views::ButtonListener overrides:
-  void ButtonPressed(views::Button* button, const ui::Event& event) {
+  virtual void ButtonPressed(views::Button* button,
+                             const ui::Event& event) OVERRIDE {
     DCHECK(button == checkbox_);
     // The checkbox state has already changed at this point, but we'll update
     // the state on NotifierSettingsView::ButtonPressed() too, so here change
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc
index c9431f8..7f80261 100644
--- a/ui/views/animation/bounds_animator_unittest.cc
+++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -22,7 +22,7 @@ class TestBoundsAnimator : public BoundsAnimator {
   }
 
  protected:
-  SlideAnimation* CreateAnimation() {
+  virtual SlideAnimation* CreateAnimation() OVERRIDE {
     SlideAnimation* animation = BoundsAnimator::CreateAnimation();
     animation->SetSlideDuration(10);
     return animation;
diff --git a/ui/views/background.cc b/ui/views/background.cc
index ba2ae21..b37318d 100644
--- a/ui/views/background.cc
+++ b/ui/views/background.cc
@@ -22,7 +22,7 @@ class SolidBackground : public Background {
     SetNativeControlColor(color);
   }
 
-  void Paint(gfx::Canvas* canvas, View* view) const {
+  virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
     // Fill the background. Note that we don't constrain to the bounds as
     // canvas is already clipped for us.
     canvas->DrawColor(get_color());
@@ -45,7 +45,7 @@ class BackgroundPainter : public Background {
   }
 
 
-  void Paint(gfx::Canvas* canvas, View* view) const {
+  virtual void Paint(gfx::Canvas* canvas, View* view) const OVERRIDE {
     Painter::PaintPainterAt(canvas, painter_, view->GetLocalBounds());
   }
 
diff --git a/ui/views/controls/menu/menu_model_adapter_unittest.cc b/ui/views/controls/menu/menu_model_adapter_unittest.cc
index 2e922cb..e46a56e 100644
--- a/ui/views/controls/menu/menu_model_adapter_unittest.cc
+++ b/ui/views/controls/menu/menu_model_adapter_unittest.cc
@@ -51,7 +51,7 @@ class MenuModelBase : public ui::MenuModel {
     return index + command_id_base_;
   }
 
-  string16 GetLabelAt(int index) const OVERRIDE {
+  virtual string16 GetLabelAt(int index) const OVERRIDE {
     return items_[index].label;
   }
 
diff --git a/ui/views/controls/menu/menu_runner.cc b/ui/views/controls/menu/menu_runner.cc
index 3545fc4..16ad24e 100644
--- a/ui/views/controls/menu/menu_runner.cc
+++ b/ui/views/controls/menu/menu_runner.cc
@@ -49,7 +49,7 @@ class MenuRunnerImpl : public internal::MenuControllerDelegate {
   virtual void SiblingMenuCreated(MenuItemView* menu) OVERRIDE;
 
  private:
-  ~MenuRunnerImpl();
+  virtual ~MenuRunnerImpl();
 
   // Cleans up after the menu is no longer showing. |result| is the menu that
   // the user selected, or NULL if nothing was selected.
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index c3a6f0f..afb0d06 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -44,37 +44,37 @@ class MenuScrollButton : public View {
         pref_height_(MenuItemView::pref_menu_height()) {
   }
 
-  virtual gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(
         host_->GetMenuItem()->GetMenuConfig().scroll_arrow_height * 2 - 1,
         pref_height_);
   }
 
-  virtual bool CanDrop(const OSExchangeData& data) {
+  virtual bool CanDrop(const OSExchangeData& data) OVERRIDE {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     return true;  // Always return true so that drop events are targeted to us.
   }
 
-  virtual void OnDragEntered(const ui::DropTargetEvent& event) {
+  virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragEnteredScrollButton(
         host_, is_up_);
   }
 
-  virtual int OnDragUpdated(const ui::DropTargetEvent& event) {
+  virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
-  virtual void OnDragExited() {
+  virtual void OnDragExited() OVERRIDE {
     DCHECK(host_->GetMenuItem()->GetMenuController());
     host_->GetMenuItem()->GetMenuController()->OnDragExitedScrollButton(host_);
   }
 
-  virtual int OnPerformDrop(const ui::DropTargetEvent& event) {
+  virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE {
     return ui::DragDropTypes::DRAG_NONE;
   }
 
-  virtual void OnPaint(gfx::Canvas* canvas) {
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     const MenuConfig& config = host_->GetMenuItem()->GetMenuConfig();
 
     // The background.
@@ -143,7 +143,7 @@ class MenuScrollViewContainer::MenuScrollView : public View {
     AddChildView(child);
   }
 
-  virtual void ScrollRectToVisible(const gfx::Rect& rect) {
+  virtual void ScrollRectToVisible(const gfx::Rect& rect) OVERRIDE {
     // NOTE: this assumes we only want to scroll in the y direction.
 
     // Convert rect.y() to view's coordinates and make sure we don't show past
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index fac401d..df2ef8f 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -99,7 +99,7 @@ class ScrollView::Viewport : public View {
         scroll_rect);
   }
 
-  void ChildPreferredSizeChanged(View* child) OVERRIDE {
+  virtual void ChildPreferredSizeChanged(View* child) OVERRIDE {
     if (parent())
       parent()->Layout();
   }
diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc
index 2fe709c..3c5c6fa 100644
--- a/ui/views/controls/table/table_view_unittest.cc
+++ b/ui/views/controls/table/table_view_unittest.cc
@@ -157,7 +157,7 @@ class TestTableView : public TableView {
   }
 
   // View overrides:
-  virtual bool HasFocus() const {
+  virtual bool HasFocus() const OVERRIDE {
     // Overriden so key processing works.
     return true;
   }
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 91ee81f..dbd875c 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -129,22 +129,22 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
 
   // TextfieldController:
   virtual void ContentsChanged(Textfield* sender,
-                               const string16& new_contents) {
+                               const string16& new_contents) OVERRIDE {
     ASSERT_NE(last_contents_, new_contents);
     last_contents_ = new_contents;
   }
 
   virtual bool HandleKeyEvent(Textfield* sender,
-                              const ui::KeyEvent& key_event) {
+                              const ui::KeyEvent& key_event) OVERRIDE {
     // TODO(oshima): figure out how to test the keystroke.
     return false;
   }
 
-  virtual void OnBeforeUserAction(Textfield* sender) {
+  virtual void OnBeforeUserAction(Textfield* sender) OVERRIDE {
     ++on_before_user_action_;
   }
 
-  virtual void OnAfterUserAction(Textfield* sender) {
+  virtual void OnAfterUserAction(Textfield* sender) OVERRIDE {
     ++on_after_user_action_;
   }
 
diff --git a/ui/views/controls/textfield/textfield_views_model_unittest.cc b/ui/views/controls/textfield/textfield_views_model_unittest.cc
index fe72a79..3317a68 100644
--- a/ui/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/ui/views/controls/textfield/textfield_views_model_unittest.cc
@@ -51,7 +51,7 @@ class TextfieldViewsModelTest : public ViewsTestBase,
         composition_text_confirmed_or_cleared_(false) {
   }
 
-  virtual void OnCompositionTextConfirmedOrCleared() {
+  virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE {
     composition_text_confirmed_or_cleared_ = true;
   }
 
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc
index 99b2026..296b07c 100644
--- a/ui/views/examples/scroll_view_example.cc
+++ b/ui/views/examples/scroll_view_example.cc
@@ -23,7 +23,7 @@ class ScrollViewExample::ScrollableView : public View {
     AddChildView(new RadioButton(ASCIIToUTF16("Radio Button"), 0));
   }
 
-  virtual gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(width(), height());
   }
 
@@ -37,7 +37,7 @@ class ScrollViewExample::ScrollableView : public View {
     view->SetBounds(0, y, size.width(), size.height());
   }
 
-  virtual void Layout() {
+  virtual void Layout() OVERRIDE {
     PlaceChildY(0, 0);
     PlaceChildY(1, height() / 2);
     SizeToPreferredSize();
diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc
index 913d079..ccc3c79 100644
--- a/ui/views/examples/throbber_example.cc
+++ b/ui/views/examples/throbber_example.cc
@@ -25,11 +25,11 @@ class ThrobberView : public View {
     throbber_->Start();
   }
 
-  virtual gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(width(), height());
   }
 
-  virtual void Layout() {
+  virtual void Layout() OVERRIDE {
     View* child = child_at(0);
     gfx::Size ps = child->GetPreferredSize();
     child->SetBounds((width() - ps.width()) / 2,
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index 318264c..74a247a 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -59,11 +59,11 @@ class SimpleTestView : public View {
     set_id(view_id);
   }
 
-  virtual void OnFocus() {
+  virtual void OnFocus() OVERRIDE {
     event_list_->push_back(FocusTestEvent(ON_FOCUS, id()));
   }
 
-  virtual void OnBlur() {
+  virtual void OnBlur() OVERRIDE {
     event_list_->push_back(FocusTestEvent(ON_BLUR, id()));
   }
 
@@ -576,7 +576,7 @@ class FocusManagerDtorTest : public FocusManagerTest {
         : dtor_tracker_(dtor_tracker) {
     }
 
-    FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
+    virtual FocusManager* CreateFocusManager(Widget* widget) OVERRIDE {
       return new FocusManagerDtorTracked(widget, dtor_tracker_);
     }
 
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index c110b21..15fc93a 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -108,7 +108,7 @@ class PaneView : public View, public FocusTraversable {
   }
 
   // Overridden from views::View:
-  virtual FocusTraversable* GetPaneFocusTraversable() {
+  virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE {
     if (focus_search_)
       return this;
     else
@@ -116,13 +116,13 @@ class PaneView : public View, public FocusTraversable {
   }
 
   // Overridden from views::FocusTraversable:
-  virtual views::FocusSearch* GetFocusSearch() {
+  virtual views::FocusSearch* GetFocusSearch() OVERRIDE {
     return focus_search_;
   }
-  virtual FocusTraversable* GetFocusTraversableParent() {
+  virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE {
     return NULL;
   }
-  virtual View* GetFocusTraversableParentView() {
+  virtual View* GetFocusTraversableParentView() OVERRIDE {
     return NULL;
   }
 
@@ -146,11 +146,13 @@ class BorderView : public NativeViewHost {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
-  virtual FocusTraversable* GetFocusTraversable() {
+  virtual FocusTraversable* GetFocusTraversable() OVERRIDE {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
-  virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child) {
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View *parent,
+                                    View *child) OVERRIDE {
     NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
 
     if (child == this && is_add) {
@@ -186,7 +188,7 @@ class BorderView : public NativeViewHost {
 
 class FocusTraversalTest : public FocusManagerTest {
  public:
-  ~FocusTraversalTest();
+  virtual ~FocusTraversalTest();
 
   virtual void InitContentView() OVERRIDE;
 
diff --git a/ui/views/focus_border.cc b/ui/views/focus_border.cc
index 790256b..68fd430 100644
--- a/ui/views/focus_border.cc
+++ b/ui/views/focus_border.cc
@@ -20,7 +20,7 @@ class DashedFocusBorder : public FocusBorder {
         bottom_inset_(bottom_inset) {
   }
 
-  virtual void Paint(const View& view, gfx::Canvas* canvas) const {
+  virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE {
     gfx::Rect rect(view.GetLocalBounds());
     rect.Inset(left_inset_, top_inset_, right_inset_, bottom_inset_);
     canvas->DrawFocusRect(rect);
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index b257201..ae8ba02 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -178,7 +178,7 @@ class Column : public LayoutElement {
   GridLayout::Alignment h_align() { return h_align_; }
   GridLayout::Alignment v_align() { return v_align_; }
 
-  virtual void ResetSize();
+  virtual void ResetSize() OVERRIDE;
 
  private:
   friend class ColumnSet;
@@ -190,7 +190,7 @@ class Column : public LayoutElement {
   // to that size. This should only be used for the master column.
   void UnifySameSizedColumnSizes();
 
-  virtual void AdjustSize(int size);
+  virtual void AdjustSize(int size) OVERRIDE;
 
   const GridLayout::Alignment h_align_;
   const GridLayout::Alignment v_align_;
@@ -274,7 +274,7 @@ class Row : public LayoutElement {
 
   virtual ~Row() {}
 
-  virtual void ResetSize() {
+  virtual void ResetSize() OVERRIDE {
     max_ascent_ = max_descent_ = 0;
     SetSize(height_);
   }
diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc
index 35f0a0e..badaee0 100644
--- a/ui/views/mouse_watcher.cc
+++ b/ui/views/mouse_watcher.cc
@@ -27,7 +27,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
     MessageLoopForUI::current()->AddObserver(this);
   }
 
-  ~Observer() {
+  virtual ~Observer() {
     MessageLoopForUI::current()->RemoveObserver(this);
   }
 
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 6ea1a25..53b8336 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -935,10 +935,10 @@ class HitTestView : public View {
 
  protected:
   // Overridden from View:
-  virtual bool HasHitTestMask() const {
+  virtual bool HasHitTestMask() const OVERRIDE {
     return has_hittest_mask_;
   }
-  virtual void GetHitTestMask(gfx::Path* mask) const {
+  virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {
     DCHECK(has_hittest_mask_);
     DCHECK(mask);
 
@@ -1896,9 +1896,10 @@ class TestNativeViewHierarchy : public View {
   TestNativeViewHierarchy() {
   }
 
-  virtual void NativeViewHierarchyChanged(bool attached,
-                                          gfx::NativeView native_view,
-                                          internal::RootView* root_view) {
+  virtual void NativeViewHierarchyChanged(
+      bool attached,
+      gfx::NativeView native_view,
+      internal::RootView* root_view) OVERRIDE {
     NotificationInfo info;
     info.attached = attached;
     info.native_view = native_view;
@@ -2033,7 +2034,7 @@ class TransformPaintView : public TestView {
   gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; }
 
   // Overridden from View:
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) {
+  virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE {
     gfx::Rect xrect = ConvertRectToParent(rect);
     scheduled_paint_rect_.Union(xrect);
   }
@@ -2271,10 +2272,10 @@ class VisibleBoundsView : public View {
 
  private:
   // Overridden from View:
-  virtual bool NeedsNotificationWhenVisibleBoundsChange() const {
+  virtual bool NeedsNotificationWhenVisibleBoundsChange() const OVERRIDE {
      return true;
   }
-  virtual void OnVisibleBoundsChanged() {
+  virtual void OnVisibleBoundsChanged() OVERRIDE {
     received_notification_ = true;
   }
 
@@ -2896,7 +2897,7 @@ class TestLayerAnimator : public ui::LayerAnimator {
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
 
  protected:
-  ~TestLayerAnimator() { }
+  virtual ~TestLayerAnimator() { }
 
  private:
   gfx::Rect last_bounds_;
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index c1e5602..ee03493b 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -107,14 +107,14 @@ class DefaultWidgetDelegate : public WidgetDelegate {
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
-  virtual Widget* GetWidget() {
+  virtual Widget* GetWidget() OVERRIDE {
     return widget_;
   }
-  virtual const Widget* GetWidget() const {
+  virtual const Widget* GetWidget() const OVERRIDE {
     return widget_;
   }
 
-  virtual bool CanActivate() const {
+  virtual bool CanActivate() const OVERRIDE {
     return can_activate_;
   }