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

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

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert Label implementation changes. Created 6 years, 5 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
« no previous file with comments | « ui/message_center/views/bounded_label.cc ('k') | ui/views/controls/button/label_button.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 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/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/sys_color_change_listener.h" 9 #include "ui/gfx/sys_color_change_listener.h"
10 #include "ui/views/controls/button/label_button_border.h" 10 #include "ui/views/controls/button/label_button_border.h"
(...skipping 17 matching lines...) Expand all
28 if (!gfx::IsInvertedColorScheme()) { 28 if (!gfx::IsInvertedColorScheme()) {
29 SetTextColor(STATE_NORMAL, GetNativeTheme()-> 29 SetTextColor(STATE_NORMAL, GetNativeTheme()->
30 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonEnabledColor)); 30 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonEnabledColor));
31 SetTextColor(STATE_HOVERED, GetNativeTheme()-> 31 SetTextColor(STATE_HOVERED, GetNativeTheme()->
32 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHoverColor)); 32 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonHoverColor));
33 SetTextColor(STATE_PRESSED, GetNativeTheme()-> 33 SetTextColor(STATE_PRESSED, GetNativeTheme()->
34 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonPressedColor)); 34 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonPressedColor));
35 SetTextColor(STATE_DISABLED, GetNativeTheme()-> 35 SetTextColor(STATE_DISABLED, GetNativeTheme()->
36 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonDisabledColor)); 36 GetSystemColor(ui::NativeTheme::kColorId_BlueButtonDisabledColor));
37 37
38 label()->set_shadows(gfx::ShadowValues( 38 label()->SetShadows(gfx::ShadowValues(
39 1, 39 1,
40 gfx::ShadowValue( 40 gfx::ShadowValue(
41 gfx::Point(0, 1), 41 gfx::Point(0, 1),
42 0, 42 0,
43 GetNativeTheme()->GetSystemColor( 43 GetNativeTheme()->GetSystemColor(
44 ui::NativeTheme::kColorId_BlueButtonShadowColor)))); 44 ui::NativeTheme::kColorId_BlueButtonShadowColor))));
45 } 45 }
46 } 46 }
47 47
48 const char* BlueButton::GetClassName() const { 48 const char* BlueButton::GetClassName() const {
(...skipping 18 matching lines...) Expand all
67 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter( 67 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(
68 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets)); 68 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));
69 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter( 69 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(
70 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets)); 70 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));
71 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter( 71 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(
72 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets)); 72 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
73 return button_border.Pass(); 73 return button_border.Pass();
74 } 74 }
75 75
76 } // namespace views 76 } // namespace views
OLDNEW
« no previous file with comments | « ui/message_center/views/bounded_label.cc ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698