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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 8b044e74a2fbd1ebe289ffa33a5ee6f75fd0f6d4..9bc3d7f2863f4730678d9d0f3902003a38aeb946 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -184,11 +184,11 @@ class BookmarkButtonBase : public views::LabelButton {
}
}
- virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE {
+ virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) override {
return HitTestPoint(point) && CanProcessEventsWithinSubtree() ? this : NULL;
}
- virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const OVERRIDE {
+ virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder();
border->set_insets(gfx::Insets(kButtonPaddingVertical,
kButtonPaddingHorizontal,
@@ -197,7 +197,7 @@ class BookmarkButtonBase : public views::LabelButton {
return border.Pass();
}
- virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE {
+ virtual bool IsTriggerableEvent(const ui::Event& e) override {
return e.type() == ui::ET_GESTURE_TAP ||
e.type() == ui::ET_GESTURE_TAP_DOWN ||
event_utils::IsPossibleDispositionEvent(e);
@@ -228,7 +228,7 @@ class BookmarkButton : public BookmarkButtonBase {
}
virtual bool GetTooltipText(const gfx::Point& p,
- base::string16* tooltip) const OVERRIDE {
+ base::string16* tooltip) const override {
gfx::Point location(p);
ConvertPointToScreen(this, &location);
*tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(
@@ -236,7 +236,7 @@ class BookmarkButton : public BookmarkButtonBase {
return !tooltip->empty();
}
- virtual const char* GetClassName() const OVERRIDE {
+ virtual const char* GetClassName() const override {
return kViewClassName;
}
@@ -264,7 +264,7 @@ class ShortcutButton : public BookmarkButtonBase {
: BookmarkButtonBase(listener, title) {
}
- virtual const char* GetClassName() const OVERRIDE {
+ virtual const char* GetClassName() const override {
return kViewClassName;
}
@@ -298,13 +298,13 @@ class BookmarkFolderButton : public views::MenuButton {
}
virtual bool GetTooltipText(const gfx::Point& p,
- base::string16* tooltip) const OVERRIDE {
+ base::string16* tooltip) const override {
if (label()->GetPreferredSize().width() > label()->size().width())
*tooltip = GetText();
return !tooltip->empty();
}
- virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE {
+ virtual bool IsTriggerableEvent(const ui::Event& e) override {
// Left clicks and taps should show the menu contents and right clicks
// should show the context menu. They should not trigger the opening of
// underlying urls.
@@ -332,7 +332,7 @@ class OverFlowButton : public views::MenuButton {
: MenuButton(NULL, base::string16(), owner, false),
owner_(owner) {}
- virtual bool OnMousePressed(const ui::MouseEvent& e) OVERRIDE {
+ virtual bool OnMousePressed(const ui::MouseEvent& e) override {
owner_->StopThrobbing(true);
return views::MenuButton::OnMousePressed(e);
}
@@ -420,7 +420,7 @@ class BookmarkBarView::ButtonSeparatorView : public views::View {
ButtonSeparatorView() {}
virtual ~ButtonSeparatorView() {}
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
DetachableToolbarView::PaintVerticalDivider(
canvas, kSeparatorStartX, height(), 1,
DetachableToolbarView::kEdgeDividerColor,
@@ -428,13 +428,13 @@ class BookmarkBarView::ButtonSeparatorView : public views::View {
GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR));
}
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
// We get the full height of the bookmark bar, so that the height returned
// here doesn't matter.
return gfx::Size(kSeparatorWidth, 1);
}
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
+ virtual void GetAccessibleState(ui::AXViewState* state) override {
state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR);
state->role = ui::AX_ROLE_SPLITTER;
}
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698