| Index: ui/views/controls/button/checkbox.cc
|
| diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
|
| index 8e85a2dac4d5292e31e9cdc3ca4f3432f54b648c..a967cbd5499125d13f8730ea9ab9c7f028016e2f 100644
|
| --- a/ui/views/controls/button/checkbox.cc
|
| +++ b/ui/views/controls/button/checkbox.cc
|
| @@ -36,11 +36,10 @@ void Checkbox::SetChecked(bool checked) {
|
|
|
| gfx::Size Checkbox::GetPreferredSize() {
|
| gfx::Size prefsize(TextButtonBase::GetPreferredSize());
|
| - gfx::NativeTheme::ExtraParams extra;
|
| - gfx::NativeTheme::State state = GetThemeState(&extra);
|
| - gfx::Size size = gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
|
| - state,
|
| - extra);
|
| + ui::NativeTheme::ExtraParams extra;
|
| + ui::NativeTheme::State state = GetThemeState(&extra);
|
| + gfx::Size size = ui::NativeTheme::instance()->GetPartSize(GetThemePart(),
|
| + state, extra);
|
| prefsize.Enlarge(size.width(), 0);
|
| prefsize.set_height(std::max(prefsize.height(), size.height()));
|
|
|
| @@ -76,16 +75,15 @@ void Checkbox::NotifyClick(const views::Event& event) {
|
| TextButtonBase::NotifyClick(event);
|
| }
|
|
|
| -gfx::NativeTheme::Part Checkbox::GetThemePart() const {
|
| - return gfx::NativeTheme::kCheckbox;
|
| +ui::NativeTheme::Part Checkbox::GetThemePart() const {
|
| + return ui::NativeTheme::kCheckbox;
|
| }
|
|
|
| gfx::Rect Checkbox::GetThemePaintRect() const {
|
| - gfx::NativeTheme::ExtraParams extra;
|
| - gfx::NativeTheme::State state = GetThemeState(&extra);
|
| - gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
|
| - state,
|
| - extra));
|
| + ui::NativeTheme::ExtraParams extra;
|
| + ui::NativeTheme::State state = GetThemeState(&extra);
|
| + gfx::Size size(ui::NativeTheme::instance()->GetPartSize(GetThemePart(), state,
|
| + extra));
|
| gfx::Insets insets = GetInsets();
|
| int y_offset = (height() - size.height()) / 2;
|
| gfx::Rect rect(insets.left(), y_offset, size.width(), size.height());
|
| @@ -93,18 +91,17 @@ gfx::Rect Checkbox::GetThemePaintRect() const {
|
| return rect;
|
| }
|
|
|
| -void Checkbox::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
|
| +void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
|
| TextButtonBase::GetExtraParams(params);
|
| params->button.checked = checked_;
|
| }
|
|
|
| gfx::Rect Checkbox::GetTextBounds() const {
|
| gfx::Rect bounds(TextButtonBase::GetTextBounds());
|
| - gfx::NativeTheme::ExtraParams extra;
|
| - gfx::NativeTheme::State state = GetThemeState(&extra);
|
| - gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
|
| - state,
|
| - extra));
|
| + ui::NativeTheme::ExtraParams extra;
|
| + ui::NativeTheme::State state = GetThemeState(&extra);
|
| + gfx::Size size(ui::NativeTheme::instance()->GetPartSize(GetThemePart(), state,
|
| + extra));
|
| bounds.Offset(size.width() + kCheckboxLabelSpacing, 0);
|
| return bounds;
|
| }
|
|
|