| 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 15 matching lines...) Expand all  Loading... | 
| 26   // probably a FocusBorder constant. | 26   // probably a FocusBorder constant. | 
| 27   const int kFocusRectInset = 3; | 27   const int kFocusRectInset = 3; | 
| 28   SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets( | 28   SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets( | 
| 29                       gfx::Insets(kFocusRectInset, kFocusRectInset + margin, | 29                       gfx::Insets(kFocusRectInset, kFocusRectInset + margin, | 
| 30                                   kFocusRectInset, kFocusRectInset))); | 30                                   kFocusRectInset, kFocusRectInset))); | 
| 31 | 31 | 
| 32   InvalidateLayout(); | 32   InvalidateLayout(); | 
| 33 } | 33 } | 
| 34 | 34 | 
| 35 void BackButton::LayoutInkDrop() { | 35 void BackButton::LayoutInkDrop() { | 
| 36   ink_drop_animation_controller()->SetInkDropBounds( | 36   ToolbarButton::LayoutInkDrop(); | 
| 37       gfx::Rect(margin_leading_, 0, width() - margin_leading_, height())); | 37   gfx::Size ink_drop_size = | 
|  | 38       ink_drop_animation_controller()->GetInkDropLargeSize(); | 
|  | 39   ink_drop_animation_controller()->SetInkDropOrigin(gfx::Point( | 
|  | 40       margin_leading_ + (width() - margin_leading_ - ink_drop_size.width()) / 2, | 
|  | 41       (height() - ink_drop_size.height()) / 2)); | 
| 38 } | 42 } | 
| 39 | 43 | 
| 40 const char* BackButton::GetClassName() const { | 44 const char* BackButton::GetClassName() const { | 
| 41   return "BackButton"; | 45   return "BackButton"; | 
| 42 } | 46 } | 
| 43 | 47 | 
| 44 scoped_ptr<views::LabelButtonBorder> BackButton::CreateDefaultBorder() const { | 48 scoped_ptr<views::LabelButtonBorder> BackButton::CreateDefaultBorder() const { | 
| 45   scoped_ptr<views::LabelButtonBorder> border = | 49   scoped_ptr<views::LabelButtonBorder> border = | 
| 46       ToolbarButton::CreateDefaultBorder(); | 50       ToolbarButton::CreateDefaultBorder(); | 
| 47 | 51 | 
| 48   // Adjust border insets to follow the margin change, | 52   // Adjust border insets to follow the margin change, | 
| 49   // which will be reflected in where the border is painted | 53   // which will be reflected in where the border is painted | 
| 50   // through |GetThemePaintRect|. | 54   // through |GetThemePaintRect|. | 
| 51   const gfx::Insets insets(border->GetInsets()); | 55   const gfx::Insets insets(border->GetInsets()); | 
| 52   border->set_insets(gfx::Insets(insets.top(), insets.left() + margin_leading_, | 56   border->set_insets(gfx::Insets(insets.top(), insets.left() + margin_leading_, | 
| 53                                  insets.bottom(), insets.right())); | 57                                  insets.bottom(), insets.right())); | 
| 54 | 58 | 
| 55   return border.Pass(); | 59   return border.Pass(); | 
| 56 } | 60 } | 
| 57 | 61 | 
| 58 gfx::Rect BackButton::GetThemePaintRect() const  { | 62 gfx::Rect BackButton::GetThemePaintRect() const  { | 
| 59   gfx::Rect rect(LabelButton::GetThemePaintRect()); | 63   gfx::Rect rect(LabelButton::GetThemePaintRect()); | 
| 60   rect.Inset(margin_leading_, 0, 0, 0); | 64   rect.Inset(margin_leading_, 0, 0, 0); | 
| 61   return rect; | 65   return rect; | 
| 62 } | 66 } | 
| 63 | 67 | 
| OLD | NEW | 
|---|