| 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 "chrome/browser/ui/views/toolbar/back_button.h" | 5 #include "chrome/browser/ui/views/toolbar/back_button.h" |
| 6 | 6 |
| 7 #include "ui/gfx/geometry/insets.h" | 7 #include "ui/gfx/geometry/insets.h" |
| 8 #include "ui/views/animation/ink_drop_animation_controller.h" | 8 #include "ui/views/animation/ink_drop_animation_controller.h" |
| 9 #include "ui/views/controls/button/label_button_border.h" | 9 #include "ui/views/controls/button/label_button_border.h" |
| 10 #include "ui/views/painter.h" | 10 #include "ui/views/painter.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 scoped_ptr<views::LabelButtonBorder> border = | 45 scoped_ptr<views::LabelButtonBorder> border = |
| 46 ToolbarButton::CreateDefaultBorder(); | 46 ToolbarButton::CreateDefaultBorder(); |
| 47 | 47 |
| 48 // Adjust border insets to follow the margin change, | 48 // Adjust border insets to follow the margin change, |
| 49 // which will be reflected in where the border is painted | 49 // which will be reflected in where the border is painted |
| 50 // through GetThemePaintRect(). | 50 // through GetThemePaintRect(). |
| 51 const gfx::Insets insets(border->GetInsets()); | 51 const gfx::Insets insets(border->GetInsets()); |
| 52 border->set_insets(gfx::Insets(insets.top(), insets.left() + margin_leading_, | 52 border->set_insets(gfx::Insets(insets.top(), insets.left() + margin_leading_, |
| 53 insets.bottom(), insets.right())); | 53 insets.bottom(), insets.right())); |
| 54 | 54 |
| 55 return border.Pass(); | 55 return border; |
| 56 } | 56 } |
| 57 | 57 |
| 58 gfx::Rect BackButton::GetThemePaintRect() const { | 58 gfx::Rect BackButton::GetThemePaintRect() const { |
| 59 gfx::Rect rect(LabelButton::GetThemePaintRect()); | 59 gfx::Rect rect(LabelButton::GetThemePaintRect()); |
| 60 const bool is_rtl = base::i18n::IsRTL(); | 60 const bool is_rtl = base::i18n::IsRTL(); |
| 61 rect.Inset(is_rtl ? 0 : margin_leading_, 0, is_rtl ? margin_leading_ : 0, 0); | 61 rect.Inset(is_rtl ? 0 : margin_leading_, 0, is_rtl ? margin_leading_ : 0, 0); |
| 62 return rect; | 62 return rect; |
| 63 } | 63 } |
| 64 | 64 |
| OLD | NEW |