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

Side by Side Diff: chrome/browser/ui/views/wrench_toolbar_button.cc

Issue 14245003: Wrench Icon: Only animate low severity status once (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 "chrome/browser/ui/views/wrench_toolbar_button.h" 5 #include "chrome/browser/ui/views/wrench_toolbar_button.h"
6 6
7 #include "grit/theme_resources.h" 7 #include "grit/theme_resources.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/base/theme_provider.h" 9 #include "ui/base/theme_provider.h"
10 10
11 WrenchToolbarButton::WrenchToolbarButton(views::MenuButtonListener* listener) 11 WrenchToolbarButton::WrenchToolbarButton(views::MenuButtonListener* listener)
12 : views::MenuButton(NULL, string16(), listener, false) { 12 : views::MenuButton(NULL, string16(), listener, false) {
13 wrench_icon_painter_.reset(new WrenchIconPainter(this)); 13 wrench_icon_painter_.reset(new WrenchIconPainter(this));
14 14
15 // Used for sizing only. 15 // Used for sizing only.
16 ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 16 ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
17 SetIcon(*rb.GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)); 17 SetIcon(*rb.GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER));
18 } 18 }
19 19
20 WrenchToolbarButton::~WrenchToolbarButton() { 20 WrenchToolbarButton::~WrenchToolbarButton() {
21 } 21 }
22 22
23 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity) { 23 void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity,
24 wrench_icon_painter_->SetSeverity(severity); 24 bool animate) {
25 wrench_icon_painter_->SetSeverity(severity, animate);
25 } 26 }
26 27
27 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) { 28 void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) {
28 // Badge non-ChromeOS ASH builds so that users know that they are using ASH. 29 // Badge non-ChromeOS ASH builds so that users know that they are using ASH.
29 #if defined(USE_ASH) && !defined(OS_CHROMEOS) 30 #if defined(USE_ASH) && !defined(OS_CHROMEOS)
30 wrench_icon_painter_->set_badge( 31 wrench_icon_painter_->set_badge(
31 *GetThemeProvider()->GetImageSkiaNamed(IDR_TOOLS_BADGE_ASH)); 32 *GetThemeProvider()->GetImageSkiaNamed(IDR_TOOLS_BADGE_ASH));
32 #endif 33 #endif
33 34
34 wrench_icon_painter_->Paint( 35 wrench_icon_painter_->Paint(
35 canvas, GetThemeProvider(), gfx::Rect(size()), GetCurrentBezelType()); 36 canvas, GetThemeProvider(), gfx::Rect(size()), GetCurrentBezelType());
36 } 37 }
37 38
38 void WrenchToolbarButton::ScheduleWrenchIconPaint() { 39 void WrenchToolbarButton::ScheduleWrenchIconPaint() {
39 SchedulePaint(); 40 SchedulePaint();
40 } 41 }
41 42
42 WrenchIconPainter::BezelType WrenchToolbarButton::GetCurrentBezelType() const { 43 WrenchIconPainter::BezelType WrenchToolbarButton::GetCurrentBezelType() const {
43 switch (state()) { 44 switch (state()) {
44 case STATE_HOVERED: 45 case STATE_HOVERED:
45 return WrenchIconPainter::BEZEL_HOVER; 46 return WrenchIconPainter::BEZEL_HOVER;
46 case STATE_PRESSED: 47 case STATE_PRESSED:
47 return WrenchIconPainter::BEZEL_PRESSED; 48 return WrenchIconPainter::BEZEL_PRESSED;
48 default: 49 default:
49 return WrenchIconPainter::BEZEL_NONE; 50 return WrenchIconPainter::BEZEL_NONE;
50 } 51 }
51 } 52 }
OLDNEW
« chrome/browser/ui/views/toolbar_view.cc ('K') | « chrome/browser/ui/views/wrench_toolbar_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698