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

Side by Side Diff: ash/display/shared_display_edge_indicator.cc

Issue 685543003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « ash/display/shared_display_edge_indicator.h ('k') | no next file » | 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 "ash/display/shared_display_edge_indicator.h" 5 #include "ash/display/shared_display_edge_indicator.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/coordinate_conversion.h" 9 #include "ash/wm/coordinate_conversion.h"
10 #include "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
11 #include "ui/aura/client/screen_position_client.h" 11 #include "ui/aura/client/screen_position_client.h"
12 #include "ui/aura/window_event_dispatcher.h" 12 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/gfx/animation/throb_animation.h" 13 #include "ui/gfx/animation/throb_animation.h"
14 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 #include "ui/gfx/display.h" 15 #include "ui/gfx/display.h"
16 #include "ui/gfx/screen.h" 16 #include "ui/gfx/screen.h"
17 #include "ui/views/view.h" 17 #include "ui/views/view.h"
18 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace { 21 namespace {
22 22
23 const int kIndicatorAnimationDurationMs = 1000; 23 const int kIndicatorAnimationDurationMs = 1000;
24 24
25 class IndicatorView : public views::View { 25 class IndicatorView : public views::View {
26 public: 26 public:
27 IndicatorView() { 27 IndicatorView() {
28 } 28 }
29 virtual ~IndicatorView() { 29 ~IndicatorView() override {}
30 }
31 30
32 void SetColor(SkColor color) { 31 void SetColor(SkColor color) {
33 color_ = color; 32 color_ = color;
34 SchedulePaint(); 33 SchedulePaint();
35 } 34 }
36 35
37 // views::Views overrides: 36 // views::Views overrides:
38 virtual void OnPaint(gfx::Canvas* canvas) override { 37 void OnPaint(gfx::Canvas* canvas) override {
39 canvas->FillRect(gfx::Rect(bounds().size()), color_); 38 canvas->FillRect(gfx::Rect(bounds().size()), color_);
40 } 39 }
41 40
42 private: 41 private:
43 SkColor color_; 42 SkColor color_;
44 DISALLOW_COPY_AND_ASSIGN(IndicatorView); 43 DISALLOW_COPY_AND_ASSIGN(IndicatorView);
45 }; 44 };
46 45
47 views::Widget* CreateWidget(const gfx::Rect& bounds, 46 views::Widget* CreateWidget(const gfx::Rect& bounds,
48 views::View* contents_view) { 47 views::View* contents_view) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 int value = animation->CurrentValueBetween(0, 255); 104 int value = animation->CurrentValueBetween(0, 255);
106 SkColor color = SkColorSetARGB(0xFF, value, value, value); 105 SkColor color = SkColorSetARGB(0xFF, value, value, value);
107 if (src_indicator_) 106 if (src_indicator_)
108 static_cast<IndicatorView*>(src_indicator_)->SetColor(color); 107 static_cast<IndicatorView*>(src_indicator_)->SetColor(color);
109 if (dst_indicator_) 108 if (dst_indicator_)
110 static_cast<IndicatorView*>(dst_indicator_)->SetColor(color); 109 static_cast<IndicatorView*>(dst_indicator_)->SetColor(color);
111 110
112 } 111 }
113 112
114 } // namespace ash 113 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/shared_display_edge_indicator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698