Index: ui/views/controls/combobox/combobox.h |
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h |
index 24011dee2bb2ec969d14c7f25dd81425e1269017..aabb476b676a4ffcff2f867d50e68f0f70087197 100644 |
--- a/ui/views/controls/combobox/combobox.h |
+++ b/ui/views/controls/combobox/combobox.h |
@@ -93,36 +93,36 @@ class VIEWS_EXPORT Combobox : public MenuDelegate, |
bool invalid() const { return invalid_; } |
// Overridden from View: |
- virtual gfx::Size GetPreferredSize() const OVERRIDE; |
- virtual const char* GetClassName() const OVERRIDE; |
- virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE; |
- virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE; |
- virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE; |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
- virtual void OnFocus() OVERRIDE; |
- virtual void OnBlur() OVERRIDE; |
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
- virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; |
- virtual void Layout() OVERRIDE; |
+ virtual gfx::Size GetPreferredSize() const override; |
+ virtual const char* GetClassName() const override; |
+ virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) override; |
+ virtual bool OnKeyPressed(const ui::KeyEvent& e) override; |
+ virtual bool OnKeyReleased(const ui::KeyEvent& e) override; |
+ virtual void OnPaint(gfx::Canvas* canvas) override; |
+ virtual void OnFocus() override; |
+ virtual void OnBlur() override; |
+ virtual void GetAccessibleState(ui::AXViewState* state) override; |
+ virtual ui::TextInputClient* GetTextInputClient() override; |
+ virtual void Layout() override; |
// Overridden from MenuDelegate: |
- virtual bool IsItemChecked(int id) const OVERRIDE; |
- virtual bool IsCommandEnabled(int id) const OVERRIDE; |
- virtual void ExecuteCommand(int id) OVERRIDE; |
+ virtual bool IsItemChecked(int id) const override; |
+ virtual bool IsCommandEnabled(int id) const override; |
+ virtual void ExecuteCommand(int id) override; |
virtual bool GetAccelerator(int id, |
- ui::Accelerator* accelerator) const OVERRIDE; |
+ ui::Accelerator* accelerator) const override; |
// Overridden from PrefixDelegate: |
- virtual int GetRowCount() OVERRIDE; |
- virtual int GetSelectedRow() OVERRIDE; |
- virtual void SetSelectedRow(int row) OVERRIDE; |
- virtual base::string16 GetTextForRow(int row) OVERRIDE; |
+ virtual int GetRowCount() override; |
+ virtual int GetSelectedRow() override; |
+ virtual void SetSelectedRow(int row) override; |
+ virtual base::string16 GetTextForRow(int row) override; |
// Overriden from ComboboxModelObserver: |
- virtual void OnComboboxModelChanged(ui::ComboboxModel* model) OVERRIDE; |
+ virtual void OnComboboxModelChanged(ui::ComboboxModel* model) override; |
// Overriden from ButtonListener: |
- virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; |
+ virtual void ButtonPressed(Button* sender, const ui::Event& event) override; |
private: |
FRIEND_TEST_ALL_PREFIXES(ComboboxTest, Click); |