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/controls/menu/menu_image_util.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/controls/menu/menu_host_root_view.h ('k') | ui/views/controls/menu/menu_item_view.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/controls/menu/menu_image_util.h" 5 #include "ui/views/controls/menu/menu_image_util.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/effects/SkGradientShader.h" 9 #include "third_party/skia/include/effects/SkGradientShader.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 24 matching lines...) Expand all
35 35
36 class RadioButtonImageSource : public gfx::CanvasImageSource { 36 class RadioButtonImageSource : public gfx::CanvasImageSource {
37 public: 37 public:
38 explicit RadioButtonImageSource(bool selected) 38 explicit RadioButtonImageSource(bool selected)
39 : CanvasImageSource(gfx::Size(kIndicatorSize + 2, kIndicatorSize + 2), 39 : CanvasImageSource(gfx::Size(kIndicatorSize + 2, kIndicatorSize + 2),
40 false), 40 false),
41 selected_(selected) { 41 selected_(selected) {
42 } 42 }
43 virtual ~RadioButtonImageSource() {} 43 virtual ~RadioButtonImageSource() {}
44 44
45 virtual void Draw(gfx::Canvas* canvas) OVERRIDE { 45 virtual void Draw(gfx::Canvas* canvas) override {
46 canvas->Translate(gfx::Vector2d(1, 1)); 46 canvas->Translate(gfx::Vector2d(1, 1));
47 47
48 SkPoint gradient_points[3]; 48 SkPoint gradient_points[3];
49 gradient_points[0].iset(0, 0); 49 gradient_points[0].iset(0, 0);
50 gradient_points[1].iset(0, 50 gradient_points[1].iset(0,
51 static_cast<int>(kIndicatorSize * kGradientStop)); 51 static_cast<int>(kIndicatorSize * kGradientStop));
52 gradient_points[2].iset(0, kIndicatorSize); 52 gradient_points[2].iset(0, kIndicatorSize);
53 SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 }; 53 SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 };
54 skia::RefPtr<SkShader> shader = skia::AdoptRef( 54 skia::RefPtr<SkShader> shader = skia::AdoptRef(
55 SkGradientShader::CreateLinear( 55 SkGradientShader::CreateLinear(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 }; 98 };
99 99
100 class SubmenuArrowImageSource : public gfx::CanvasImageSource { 100 class SubmenuArrowImageSource : public gfx::CanvasImageSource {
101 public: 101 public:
102 SubmenuArrowImageSource(int image_id) 102 SubmenuArrowImageSource(int image_id)
103 : gfx::CanvasImageSource(ui::ResourceBundle::GetSharedInstance(). 103 : gfx::CanvasImageSource(ui::ResourceBundle::GetSharedInstance().
104 GetImageNamed(image_id).ToImageSkia()->size(), false), 104 GetImageNamed(image_id).ToImageSkia()->size(), false),
105 image_id_(image_id) {} 105 image_id_(image_id) {}
106 virtual ~SubmenuArrowImageSource() {} 106 virtual ~SubmenuArrowImageSource() {}
107 107
108 virtual void Draw(gfx::Canvas* canvas) OVERRIDE { 108 virtual void Draw(gfx::Canvas* canvas) override {
109 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 109 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
110 const gfx::ImageSkia* r = rb.GetImageNamed(image_id_).ToImageSkia(); 110 const gfx::ImageSkia* r = rb.GetImageNamed(image_id_).ToImageSkia();
111 canvas->Scale(-1, 1); 111 canvas->Scale(-1, 1);
112 canvas->DrawImageInt(*r, - r->width(), 0); 112 canvas->DrawImageInt(*r, - r->width(), 0);
113 } 113 }
114 114
115 private: 115 private:
116 static gfx::Size GetSubmenuArrowSize() { 116 static gfx::Size GetSubmenuArrowSize() {
117 return ui::ResourceBundle::GetSharedInstance() 117 return ui::ResourceBundle::GetSharedInstance()
118 .GetImageNamed(IDR_MENU_HIERARCHY_ARROW).ToImageSkia()->size(); 118 .GetImageNamed(IDR_MENU_HIERARCHY_ARROW).ToImageSkia()->size();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 int image_id = selected ? IDR_MENU_RADIO_SELECTED : IDR_MENU_RADIO_EMPTY; 160 int image_id = selected ? IDR_MENU_RADIO_SELECTED : IDR_MENU_RADIO_EMPTY;
161 return ui::ResourceBundle::GetSharedInstance().GetImageNamed(image_id). 161 return ui::ResourceBundle::GetSharedInstance().GetImageNamed(image_id).
162 AsImageSkia(); 162 AsImageSkia();
163 } 163 }
164 164
165 gfx::ImageSkia GetSubmenuArrowImage(bool dark_background) { 165 gfx::ImageSkia GetSubmenuArrowImage(bool dark_background) {
166 return GetRtlSubmenuArrowImage(base::i18n::IsRTL(), dark_background); 166 return GetRtlSubmenuArrowImage(base::i18n::IsRTL(), dark_background);
167 } 167 }
168 168
169 } // namespace views 169 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_host_root_view.h ('k') | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698