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

Side by Side Diff: ui/views/examples/text_example.cc

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/examples/text_example.h ('k') | ui/views/examples/textfield_example.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 #include "ui/views/examples/text_example.h" 5 #include "ui/views/examples/text_example.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 #include "ui/gfx/font_list.h" 9 #include "ui/gfx/font_list.h"
10 #include "ui/views/border.h" 10 #include "ui/views/border.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // TextExample's content view, which draws stylized string. 62 // TextExample's content view, which draws stylized string.
63 class TextExample::TextExampleView : public View { 63 class TextExample::TextExampleView : public View {
64 public: 64 public:
65 TextExampleView() 65 TextExampleView()
66 : text_(base::ASCIIToUTF16(kShortText)), 66 : text_(base::ASCIIToUTF16(kShortText)),
67 flags_(0), 67 flags_(0),
68 halo_(false), 68 halo_(false),
69 elide_(gfx::NO_ELIDE) { 69 elide_(gfx::NO_ELIDE) {
70 } 70 }
71 71
72 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 72 virtual void OnPaint(gfx::Canvas* canvas) override {
73 View::OnPaint(canvas); 73 View::OnPaint(canvas);
74 const gfx::Rect bounds = GetContentsBounds(); 74 const gfx::Rect bounds = GetContentsBounds();
75 const SkColor color = SK_ColorDKGRAY; 75 const SkColor color = SK_ColorDKGRAY;
76 if (elide_ == gfx::FADE_TAIL) { 76 if (elide_ == gfx::FADE_TAIL) {
77 canvas->DrawFadedString(text_, font_list_, color, bounds, flags_); 77 canvas->DrawFadedString(text_, font_list_, color, bounds, flags_);
78 } else if (halo_) { 78 } else if (halo_) {
79 canvas->DrawStringRectWithHalo(text_, font_list_, color, SK_ColorYELLOW, 79 canvas->DrawStringRectWithHalo(text_, font_list_, color, SK_ColorYELLOW,
80 bounds, flags_); 80 bounds, flags_);
81 } else { 81 } else {
82 canvas->DrawStringRectWithFlags(text_, font_list_, color, bounds, flags_); 82 canvas->DrawStringRectWithFlags(text_, font_list_, color, bounds, flags_);
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 flags |= gfx::Canvas::HIDE_PREFIX; 256 flags |= gfx::Canvas::HIDE_PREFIX;
257 break; 257 break;
258 } 258 }
259 } 259 }
260 text_view_->set_flags(flags); 260 text_view_->set_flags(flags);
261 text_view_->SchedulePaint(); 261 text_view_->SchedulePaint();
262 } 262 }
263 263
264 } // namespace examples 264 } // namespace examples
265 } // namespace views 265 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/text_example.h ('k') | ui/views/examples/textfield_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698