| Index: ui/views/examples/multiline_example.cc
|
| diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc
|
| index 8c86d9e25f1fa185531b972795845bad710a2118..d2d69cce1465a1cdafe6ccd3ef4f861f28876be4 100644
|
| --- a/ui/views/examples/multiline_example.cc
|
| +++ b/ui/views/examples/multiline_example.cc
|
| @@ -35,7 +35,7 @@ class PreferredSizeLabel : public Label {
|
| virtual ~PreferredSizeLabel() {}
|
|
|
| // Label:
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| return gfx::Size(50, Label::GetPreferredSize().height());
|
| }
|
|
|
| @@ -55,12 +55,12 @@ class MultilineExample::RenderTextView : public View {
|
| SetBorder(Border::CreateSolidBorder(2, SK_ColorGRAY));
|
| }
|
|
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
|
| + virtual void OnPaint(gfx::Canvas* canvas) override {
|
| View::OnPaint(canvas);
|
| render_text_->Draw(canvas);
|
| }
|
|
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| // Turn off multiline mode to get the single-line text size, which is the
|
| // preferred size for this view.
|
| render_text_->SetMultiline(false);
|
| @@ -71,7 +71,7 @@ class MultilineExample::RenderTextView : public View {
|
| return size;
|
| }
|
|
|
| - virtual int GetHeightForWidth(int w) const OVERRIDE {
|
| + virtual int GetHeightForWidth(int w) const override {
|
| // TODO(ckocagil): Why does this happen?
|
| if (w == 0)
|
| return View::GetHeightForWidth(w);
|
| @@ -104,7 +104,7 @@ class MultilineExample::RenderTextView : public View {
|
| }
|
|
|
| private:
|
| - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
|
| + virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override {
|
| gfx::Rect bounds = GetLocalBounds();
|
| bounds.Inset(GetInsets());
|
| render_text_->SetDisplayRect(bounds);
|
|
|