Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2160)

Unified Diff: Source/web/ExternalPopupMenuTest.cpp

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/ExternalPopupMenu.h ('k') | Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ExternalPopupMenuTest.cpp
diff --git a/Source/web/ExternalPopupMenuTest.cpp b/Source/web/ExternalPopupMenuTest.cpp
index 33a9a0a5af42e792b9a3df6f4a5f40a7d154fe65..397c87f838b1de4a122123e1446bfb8fa3ee18fd 100644
--- a/Source/web/ExternalPopupMenuTest.cpp
+++ b/Source/web/ExternalPopupMenuTest.cpp
@@ -21,15 +21,15 @@ public:
TestPopupMenuClient() : m_listSize(0) { }
virtual ~TestPopupMenuClient() { }
- virtual void valueChanged(unsigned listIndex, bool fireEvents = true) OVERRIDE { }
- virtual void selectionChanged(unsigned listIndex, bool fireEvents = true) OVERRIDE { }
- virtual void selectionCleared() OVERRIDE { }
-
- virtual String itemText(unsigned listIndex) const OVERRIDE { return emptyString(); }
- virtual String itemToolTip(unsigned listIndex) const OVERRIDE { return emptyString(); }
- virtual String itemAccessibilityText(unsigned listIndex) const OVERRIDE { return emptyString(); }
- virtual bool itemIsEnabled(unsigned listIndex) const OVERRIDE { return true; }
- virtual PopupMenuStyle itemStyle(unsigned listIndex) const OVERRIDE
+ virtual void valueChanged(unsigned listIndex, bool fireEvents = true) override { }
+ virtual void selectionChanged(unsigned listIndex, bool fireEvents = true) override { }
+ virtual void selectionCleared() override { }
+
+ virtual String itemText(unsigned listIndex) const override { return emptyString(); }
+ virtual String itemToolTip(unsigned listIndex) const override { return emptyString(); }
+ virtual String itemAccessibilityText(unsigned listIndex) const override { return emptyString(); }
+ virtual bool itemIsEnabled(unsigned listIndex) const override { return true; }
+ virtual PopupMenuStyle itemStyle(unsigned listIndex) const override
{
FontDescription fontDescription;
fontDescription.setComputedSize(12.0);
@@ -38,17 +38,17 @@ public:
bool displayNone = m_displayNoneIndexSet.find(listIndex) != m_displayNoneIndexSet.end();
return PopupMenuStyle(Color::black, Color::white, font, true, displayNone, Length(), TextDirection(), false);
}
- virtual PopupMenuStyle menuStyle() const OVERRIDE { return itemStyle(0); }
- virtual LayoutUnit clientPaddingLeft() const OVERRIDE { return 0; }
- virtual LayoutUnit clientPaddingRight() const OVERRIDE { return 0; }
- virtual int listSize() const OVERRIDE { return m_listSize; }
- virtual int selectedIndex() const OVERRIDE { return 0; }
- virtual void popupDidHide() OVERRIDE { }
- virtual bool itemIsSeparator(unsigned listIndex) const OVERRIDE { return false;}
- virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE { return false; }
- virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE { return listIndex == 0;}
- virtual void setTextFromItem(unsigned listIndex) OVERRIDE { }
- virtual bool multiple() const OVERRIDE { return false; }
+ virtual PopupMenuStyle menuStyle() const override { return itemStyle(0); }
+ virtual LayoutUnit clientPaddingLeft() const override { return 0; }
+ virtual LayoutUnit clientPaddingRight() const override { return 0; }
+ virtual int listSize() const override { return m_listSize; }
+ virtual int selectedIndex() const override { return 0; }
+ virtual void popupDidHide() override { }
+ virtual bool itemIsSeparator(unsigned listIndex) const override { return false;}
+ virtual bool itemIsLabel(unsigned listIndex) const override { return false; }
+ virtual bool itemIsSelected(unsigned listIndex) const override { return listIndex == 0;}
+ virtual void setTextFromItem(unsigned listIndex) override { }
+ virtual bool multiple() const override { return false; }
void setListSize(size_t size) { m_listSize = size; }
void setDisplayNoneIndex(unsigned index) { m_displayNoneIndexSet.insert(index); }
@@ -62,7 +62,7 @@ public:
ExternalPopupMenuDisplayNoneItemsTest() { }
protected:
- virtual void SetUp() OVERRIDE
+ virtual void SetUp() override
{
m_popupMenuClient.setListSize(kListSize);
« no previous file with comments | « Source/web/ExternalPopupMenu.h ('k') | Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698