| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/style/mac/dialog_button_border_mac.h" | 5 #include "ui/views/style/mac/dialog_button_border_mac.h" |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 8 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
| 9 #include "ui/compositor/canvas_painter.h" | 10 #include "ui/compositor/canvas_painter.h" |
| 10 #include "ui/gfx/canvas.h" | 11 #include "ui/gfx/canvas.h" |
| 11 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
| 12 #include "ui/views/controls/button/label_button.h" | 13 #include "ui/views/controls/button/label_button.h" |
| 13 #include "ui/views/test/views_test_base.h" | 14 #include "ui/views/test/views_test_base.h" |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 namespace { | 17 namespace { |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 | 188 |
| 188 // Any call to SetBorder() will immediately prevent themed buttons and adding | 189 // Any call to SetBorder() will immediately prevent themed buttons and adding |
| 189 // to a Widget (to pick up a NativeTheme) shouldn't restore them. | 190 // to a Widget (to pick up a NativeTheme) shouldn't restore them. |
| 190 button.SetBorder(Border::NullBorder()); | 191 button.SetBorder(Border::NullBorder()); |
| 191 EXPECT_FALSE(BorderIsDialogButton(button)); | 192 EXPECT_FALSE(BorderIsDialogButton(button)); |
| 192 button.SimulateAddToWidget(); | 193 button.SimulateAddToWidget(); |
| 193 EXPECT_FALSE(BorderIsDialogButton(button)); | 194 EXPECT_FALSE(BorderIsDialogButton(button)); |
| 194 } | 195 } |
| 195 | 196 |
| 196 } // namespace views | 197 } // namespace views |
| OLD | NEW |