| 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/toolbar_view.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/i18n/number_formatting.h" | 10 #include "base/i18n/number_formatting.h" |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 gfx::Size(0, normal_background->height() - content_shadow_height())); | 727 gfx::Size(0, normal_background->height() - content_shadow_height())); |
| 728 } | 728 } |
| 729 } | 729 } |
| 730 return size; | 730 return size; |
| 731 } | 731 } |
| 732 | 732 |
| 733 void ToolbarView::LoadImages() { | 733 void ToolbarView::LoadImages() { |
| 734 const ui::ThemeProvider* tp = GetThemeProvider(); | 734 const ui::ThemeProvider* tp = GetThemeProvider(); |
| 735 | 735 |
| 736 if (ui::MaterialDesignController::IsModeMaterial()) { | 736 if (ui::MaterialDesignController::IsModeMaterial()) { |
| 737 const int kButtonSize = 16; | |
| 738 const SkColor normal_color = | 737 const SkColor normal_color = |
| 739 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON); | 738 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON); |
| 740 const SkColor disabled_color = | 739 const SkColor disabled_color = |
| 741 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE); | 740 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE); |
| 742 | 741 |
| 743 back_->SetImage(views::Button::STATE_NORMAL, | 742 back_->SetImage(views::Button::STATE_NORMAL, |
| 744 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK, | 743 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK, |
| 745 kButtonSize, normal_color)); | 744 normal_color)); |
| 746 back_->SetImage(views::Button::STATE_DISABLED, | 745 back_->SetImage(views::Button::STATE_DISABLED, |
| 747 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK, | 746 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK, |
| 748 kButtonSize, disabled_color)); | 747 disabled_color)); |
| 749 forward_->SetImage( | 748 forward_->SetImage( |
| 750 views::Button::STATE_NORMAL, | 749 views::Button::STATE_NORMAL, |
| 751 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 750 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, |
| 752 normal_color)); | 751 normal_color)); |
| 753 forward_->SetImage( | 752 forward_->SetImage( |
| 754 views::Button::STATE_DISABLED, | 753 views::Button::STATE_DISABLED, |
| 755 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 754 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, |
| 756 disabled_color)); | 755 disabled_color)); |
| 757 home_->SetImage(views::Button::STATE_NORMAL, | 756 home_->SetImage(views::Button::STATE_NORMAL, |
| 758 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, | 757 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, |
| 759 kButtonSize, normal_color)); | 758 normal_color)); |
| 760 app_menu_button_->UpdateIcon(); | 759 app_menu_button_->UpdateIcon(); |
| 761 | 760 |
| 762 back_->set_ink_drop_base_color(normal_color); | 761 back_->set_ink_drop_base_color(normal_color); |
| 763 forward_->set_ink_drop_base_color(normal_color); | 762 forward_->set_ink_drop_base_color(normal_color); |
| 764 home_->set_ink_drop_base_color(normal_color); | 763 home_->set_ink_drop_base_color(normal_color); |
| 765 app_menu_button_->set_ink_drop_base_color(normal_color); | 764 app_menu_button_->set_ink_drop_base_color(normal_color); |
| 766 } else { | 765 } else { |
| 767 back_->SetImage(views::Button::STATE_NORMAL, | 766 back_->SetImage(views::Button::STATE_NORMAL, |
| 768 *(tp->GetImageSkiaNamed(IDR_BACK))); | 767 *(tp->GetImageSkiaNamed(IDR_BACK))); |
| 769 back_->SetImage(views::Button::STATE_DISABLED, | 768 back_->SetImage(views::Button::STATE_DISABLED, |
| (...skipping 28 matching lines...) Expand all Loading... |
| 798 SchedulePaint(); | 797 SchedulePaint(); |
| 799 } | 798 } |
| 800 | 799 |
| 801 int ToolbarView::content_shadow_height() const { | 800 int ToolbarView::content_shadow_height() const { |
| 802 #if defined(USE_ASH) | 801 #if defined(USE_ASH) |
| 803 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); | 802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); |
| 804 #else | 803 #else |
| 805 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); | 804 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); |
| 806 #endif | 805 #endif |
| 807 } | 806 } |
| OLD | NEW |