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

Side by Side Diff: ui/views/controls/image_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 unified diff | Download patch
« no previous file with comments | « ui/views/controls/glow_hover_controller.h ('k') | ui/views/controls/label.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
7 7
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 // Set / Get the tooltip text. 74 // Set / Get the tooltip text.
75 void SetTooltipText(const base::string16& tooltip); 75 void SetTooltipText(const base::string16& tooltip);
76 base::string16 GetTooltipText() const; 76 base::string16 GetTooltipText() const;
77 77
78 void set_interactive(bool interactive) { interactive_ = interactive; } 78 void set_interactive(bool interactive) { interactive_ = interactive; }
79 79
80 void SetFocusPainter(scoped_ptr<Painter> focus_painter); 80 void SetFocusPainter(scoped_ptr<Painter> focus_painter);
81 81
82 // Overriden from View: 82 // Overriden from View:
83 virtual gfx::Size GetPreferredSize() const OVERRIDE; 83 virtual gfx::Size GetPreferredSize() const override;
84 virtual void OnFocus() OVERRIDE; 84 virtual void OnFocus() override;
85 virtual void OnBlur() OVERRIDE; 85 virtual void OnBlur() override;
86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 86 virtual void OnPaint(gfx::Canvas* canvas) override;
87 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 87 virtual void GetAccessibleState(ui::AXViewState* state) override;
88 virtual bool GetTooltipText(const gfx::Point& p, 88 virtual bool GetTooltipText(const gfx::Point& p,
89 base::string16* tooltip) const OVERRIDE; 89 base::string16* tooltip) const override;
90 virtual bool CanProcessEventsWithinSubtree() const OVERRIDE; 90 virtual bool CanProcessEventsWithinSubtree() const override;
91 91
92 private: 92 private:
93 void OnPaintImage(gfx::Canvas* canvas); 93 void OnPaintImage(gfx::Canvas* canvas);
94 94
95 // Returns true if |img| is the same as the last image we painted. This is 95 // Returns true if |img| is the same as the last image we painted. This is
96 // intended to be a quick check, not exhaustive. In other words it's possible 96 // intended to be a quick check, not exhaustive. In other words it's possible
97 // for this to return false even though the images are in fact equal. 97 // for this to return false even though the images are in fact equal.
98 bool IsImageEqual(const gfx::ImageSkia& img) const; 98 bool IsImageEqual(const gfx::ImageSkia& img) const;
99 99
100 // Compute the image origin given the desired size and the receiver alignment 100 // Compute the image origin given the desired size and the receiver alignment
(...skipping 29 matching lines...) Expand all
130 void* last_painted_bitmap_pixels_; 130 void* last_painted_bitmap_pixels_;
131 131
132 scoped_ptr<views::Painter> focus_painter_; 132 scoped_ptr<views::Painter> focus_painter_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(ImageView); 134 DISALLOW_COPY_AND_ASSIGN(ImageView);
135 }; 135 };
136 136
137 } // namespace views 137 } // namespace views
138 138
139 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_ 139 #endif // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/glow_hover_controller.h ('k') | ui/views/controls/label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698