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

Unified Diff: ui/views/bubble/tray_bubble_view.cc

Issue 677413004: Standardize usage of virtual/override/final specifiers. (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
« no previous file with comments | « ui/views/bubble/tray_bubble_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/tray_bubble_view.cc
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index 53cb5265555d12021465d018541fa1760e87d090..4d231a7d49da5f2345fe0524256ca62d6476d20d 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -53,10 +53,10 @@ namespace internal {
class MouseMoveDetectorHost : public MouseWatcherHost {
public:
MouseMoveDetectorHost();
- virtual ~MouseMoveDetectorHost();
+ ~MouseMoveDetectorHost() override;
+
+ bool Contains(const gfx::Point& screen_point, MouseEventType type) override;
- virtual bool Contains(const gfx::Point& screen_point,
- MouseEventType type) override;
private:
DISALLOW_COPY_AND_ASSIGN(MouseMoveDetectorHost);
};
@@ -89,12 +89,12 @@ class TrayBubbleBorder : public BubbleBorder {
set_paint_arrow(params.arrow_paint_type);
}
- virtual ~TrayBubbleBorder() {}
+ ~TrayBubbleBorder() override {}
// Overridden from BubbleBorder.
// Sets the bubble on top of the anchor when it has no arrow.
- virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
- const gfx::Size& contents_size) const override {
+ gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
+ const gfx::Size& contents_size) const override {
if (has_arrow(arrow())) {
gfx::Rect rect =
BubbleBorder::GetBounds(position_relative_to, contents_size);
@@ -177,16 +177,15 @@ class TrayBubbleBorder : public BubbleBorder {
class TrayBubbleContentMask : public ui::LayerDelegate {
public:
explicit TrayBubbleContentMask(int corner_radius);
- virtual ~TrayBubbleContentMask();
+ ~TrayBubbleContentMask() override;
ui::Layer* layer() { return &layer_; }
// Overridden from LayerDelegate.
- virtual void OnPaintLayer(gfx::Canvas* canvas) override;
- virtual void OnDelegatedFrameDamage(
- const gfx::Rect& damage_rect_in_dip) override {}
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;
- virtual base::Closure PrepareForLayerBoundsChange() override;
+ void OnPaintLayer(gfx::Canvas* canvas) override;
+ void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override;
+ base::Closure PrepareForLayerBoundsChange() override;
private:
ui::Layer layer_;
@@ -231,10 +230,10 @@ class BottomAlignedBoxLayout : public BoxLayout {
bubble_view_(bubble_view) {
}
- virtual ~BottomAlignedBoxLayout() {}
+ ~BottomAlignedBoxLayout() override {}
private:
- virtual void Layout(View* host) override {
+ void Layout(View* host) override {
if (host->height() >= host->GetPreferredSize().height() ||
!bubble_view_->is_gesture_dragging()) {
BoxLayout::Layout(host);
« no previous file with comments | « ui/views/bubble/tray_bubble_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698