summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:10:50 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 18:10:50 +0000
commit0590b01965d96f5d45b8c6c7458508e3bbea6718 (patch)
treea88d95b961e13bb8bcc8dbbea96dc33015c7a096 /ui
parent1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d (diff)
downloadchromium_src-0590b01965d96f5d45b8c6c7458508e3bbea6718.zip
chromium_src-0590b01965d96f5d45b8c6c7458508e3bbea6718.tar.gz
chromium_src-0590b01965d96f5d45b8c6c7458508e3bbea6718.tar.bz2
Add OVERRIDE to views/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8647002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/controls/table/native_table_gtk.h45
-rw-r--r--ui/views/controls/table/table_view2.h12
2 files changed, 29 insertions, 28 deletions
diff --git a/ui/views/controls/table/native_table_gtk.h b/ui/views/controls/table/native_table_gtk.h
index 66e57e5..3ebb51f 100644
--- a/ui/views/controls/table/native_table_gtk.h
+++ b/ui/views/controls/table/native_table_gtk.h
@@ -6,6 +6,7 @@
#define UI_VIEWS_CONTROLS_TABLE_NATIVE_TABLE_GTK_H_
#pragma once
+#include "base/compiler_specific.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/models/table_model.h"
#include "ui/views/controls/table/native_table_wrapper.h"
@@ -27,31 +28,31 @@ class NativeTableGtk : public NativeControlGtk, public NativeTableWrapper {
virtual ~NativeTableGtk();
// NativeTableWrapper implementation:
- virtual int GetRowCount() const;
- virtual View* GetView();
- virtual void SetFocus();
- virtual gfx::NativeView GetTestingHandle() const;
- virtual void InsertColumn(const ui::TableColumn& column, int index);
- virtual void RemoveColumn(int index);
- virtual int GetColumnWidth(int column_index) const;
- virtual void SetColumnWidth(int column_index, int width);
- virtual int GetSelectedRowCount() const;
- virtual int GetFirstSelectedRow() const;
- virtual int GetFirstFocusedRow() const;
- virtual void ClearSelection();
- virtual void ClearRowFocus();
- virtual void SetSelectedState(int model_row, bool state);
- virtual void SetFocusState(int model_row, bool state);
- virtual bool IsRowSelected(int model_row) const;
- virtual bool IsRowFocused(int model_row) const;
- virtual void OnRowsChanged(int start, int length);
- virtual void OnRowsAdded(int start, int length);
- virtual void OnRowsRemoved(int start, int length);
- virtual gfx::Rect GetBounds() const;
+ virtual int GetRowCount() const OVERRIDE;
+ virtual View* GetView() OVERRIDE;
+ virtual void SetFocus() OVERRIDE;
+ virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
+ virtual void InsertColumn(const ui::TableColumn& column, int index) OVERRIDE;
+ virtual void RemoveColumn(int index) OVERRIDE;
+ virtual int GetColumnWidth(int column_index) const OVERRIDE;
+ virtual void SetColumnWidth(int column_index, int width) OVERRIDE;
+ virtual int GetSelectedRowCount() const OVERRIDE;
+ virtual int GetFirstSelectedRow() const OVERRIDE;
+ virtual int GetFirstFocusedRow() const OVERRIDE;
+ virtual void ClearSelection() OVERRIDE;
+ virtual void ClearRowFocus() OVERRIDE;
+ virtual void SetSelectedState(int model_row, bool state) OVERRIDE;
+ virtual void SetFocusState(int model_row, bool state) OVERRIDE;
+ virtual bool IsRowSelected(int model_row) const OVERRIDE;
+ virtual bool IsRowFocused(int model_row) const OVERRIDE;
+ virtual void OnRowsChanged(int start, int length) OVERRIDE;
+ virtual void OnRowsAdded(int start, int length) OVERRIDE;
+ virtual void OnRowsRemoved(int start, int length) OVERRIDE;
+ virtual gfx::Rect GetBounds() const OVERRIDE;
protected:
// NativeControlGtk implementation:
- virtual void CreateNativeControl();
+ virtual void CreateNativeControl() OVERRIDE;
private:
void InsertTextColumn(const ui::TableColumn& column, int index);
diff --git a/ui/views/controls/table/table_view2.h b/ui/views/controls/table/table_view2.h
index 4767bb4..d4f4e86 100644
--- a/ui/views/controls/table/table_view2.h
+++ b/ui/views/controls/table/table_view2.h
@@ -135,10 +135,10 @@ class VIEWS_EXPORT TableView2 : public View, public ui::TableModelObserver {
iterator SelectionEnd();
// ui::TableModelObserver methods.
- virtual void OnModelChanged();
- virtual void OnItemsChanged(int start, int length);
- virtual void OnItemsAdded(int start, int length);
- virtual void OnItemsRemoved(int start, int length);
+ virtual void OnModelChanged() OVERRIDE;
+ virtual void OnItemsChanged(int start, int length) OVERRIDE;
+ virtual void OnItemsAdded(int start, int length) OVERRIDE;
+ virtual void OnItemsRemoved(int start, int length) OVERRIDE;
void SetObserver(TableViewObserver* observer) {
table_view_observer_ = observer;
@@ -189,9 +189,9 @@ class VIEWS_EXPORT TableView2 : public View, public ui::TableModelObserver {
return vertical_lines_;
}
- virtual void Layout();
+ virtual void Layout() OVERRIDE;
- virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
+ virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
// Used by tests.
virtual gfx::NativeView GetTestingHandle();