ui/views/controls/button/blue_button.cc - Issue 14921006: Fix LabelButtonBorder image blending.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/controls/button/blue_button.cc

Issue 14921006: Fix LabelButtonBorder image blending. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use a skia::RefPtr to free the SkXfermode after use. Created 7 years, 6 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/button/blue_button.h"	5 #include "ui/views/controls/button/blue_button.h"

6	6

7 #include "grit/ui_resources.h"	7 #include "grit/ui_resources.h"

8 #include "ui/base/accessibility/accessible_view_state.h"	8 #include "ui/base/accessibility/accessible_view_state.h"

9 #include "ui/base/resource/resource_bundle.h"	9 #include "ui/base/resource/resource_bundle.h"

10 #include "ui/views/controls/button/label_button_border.h"	10 #include "ui/views/controls/button/label_button_border.h"

(...skipping 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 label()->SetShadowColors(kBlueButtonShadowColor, kBlueButtonShadowColor);	62 label()->SetShadowColors(kBlueButtonShadowColor, kBlueButtonShadowColor);

63 label()->SetShadowOffset(0, 1);	63 label()->SetShadowOffset(0, 1);

64 }	64 }

65	65

66 BlueButton::~BlueButton() {}	66 BlueButton::~BlueButton() {}

67	67

68 const char* BlueButton::GetClassName() const {	68 const char* BlueButton::GetClassName() const {

69 return BlueButton::kViewClassName;	69 return BlueButton::kViewClassName;

70 }	70 }

71	71

72 // TODO(msw): Re-enable animations for blue buttons. It's disabled now due

73 // to crbug.com/239121.

74 const ui::Animation* BlueButton::GetThemeAnimation() const {

75 return NULL;

76 }

77

78 } // namespace views	72 } // namespace views

OLD	NEW