views: lighten stroke for STATE_DISABLED buttons

views: lighten stroke for STATE_DISABLED buttons

BUG=654608
Committed: https://crrev.com/6896d31ae7ce59903d5ed28a752e284c3fbaedd7
Cr-Commit-Position: refs/heads/master@{#424837}

[Elly Fong-Jones, 2016-10-12 18:01:41]

Description was changed from

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608
==========

to

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608
==========

[Elly Fong-Jones, 2016-10-12 18:01:41]

ellyjones@chromium.org changed reviewers:
+ sadrul@chromium.org

[Elly Fong-Jones, 2016-10-12 18:01:48]

sadrul: ptal? :)

[sadrul, 2016-10-12 18:25:21]

lgtm (+tdanderson@ fyi for chromeos)

[Elly Fong-Jones, 2016-10-12 18:30:24]

The CQ bit was checked by ellyjones@chromium.org

[commit-bot: I haz the power, 2016-10-12 18:30:46]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-12 19:34:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-12 19:34:15]

Failed to apply patch for ui/views/controls/button/md_text_button.cc:
While running git apply --index -3 -p1;
  error: patch failed: ui/views/controls/button/md_text_button.cc:272
  Falling back to three-way merge...
  Applied patch to 'ui/views/controls/button/md_text_button.cc' with conflicts.
  U ui/views/controls/button/md_text_button.cc

Patch:       ui/views/controls/button/md_text_button.cc
Index: ui/views/controls/button/md_text_button.cc
diff --git a/ui/views/controls/button/md_text_button.cc
b/ui/views/controls/button/md_text_button.cc
index
9b3d05986a6469e9d7ec436c6575f13065149d8d..38d4b0fbdcdf599b1b531c5fb6929eb53cdee603
100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc
@@ -272,6 +272,14 @@ void MdTextButton::UpdateColors() {
 
   SkColor stroke_color =
       is_prominent_ ? SK_ColorTRANSPARENT : SkColorSetA(text_color, 0x33);
+
+  // Disabled, non-prominent buttons need their stroke lightened. Prominent
+  // buttons need it left at SK_ColorTRANSPARENT from above.
+  if (state() == STATE_DISABLED && !is_prominent_) {
+    stroke_color = color_utils::BlendTowardOppositeLuma(
+        stroke_color, gfx::kDisabledControlAlpha);
+  }
+
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(

[Elly Fong-Jones, 2016-10-12 19:40:05]

The CQ bit was checked by ellyjones@chromium.org

[Elly Fong-Jones, 2016-10-12 19:40:05]

The patchset sent to the CQ was uploaded after l-g-t-m from sadrul@chromium.org
Link to the patchset: https://codereview.chromium.org/2411343003/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2016-10-12 19:40:36]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-12 20:27:58]

Description was changed from

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608
==========

to

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608
==========

[commit-bot: I haz the power, 2016-10-12 20:27:59]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-10-12 20:30:08]

Description was changed from

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608
==========

to

==========
views: lighten stroke for STATE_DISABLED buttons

BUG=654608

Committed: https://crrev.com/6896d31ae7ce59903d5ed28a752e284c3fbaedd7
Cr-Commit-Position: refs/heads/master@{#424837}
==========

[commit-bot: I haz the power, 2016-10-12 20:30:09]

Patchset 2 (id:??) landed as
https://crrev.com/6896d31ae7ce59903d5ed28a752e284c3fbaedd7
Cr-Commit-Position: refs/heads/master@{#424837}