| 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 770 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 770 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, |
| 771 normal_color)); | 771 normal_color)); |
| 772 forward_->SetImage( | 772 forward_->SetImage( |
| 773 views::Button::STATE_DISABLED, | 773 views::Button::STATE_DISABLED, |
| 774 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 774 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, |
| 775 disabled_color)); | 775 disabled_color)); |
| 776 home_->SetImage(views::Button::STATE_NORMAL, | 776 home_->SetImage(views::Button::STATE_NORMAL, |
| 777 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, | 777 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, |
| 778 kButtonSize, normal_color)); | 778 kButtonSize, normal_color)); |
| 779 app_menu_button_->UpdateIcon(); | 779 app_menu_button_->UpdateIcon(); |
| 780 |
| 781 back_->set_ink_drop_base_color(normal_color); |
| 782 forward_->set_ink_drop_base_color(normal_color); |
| 783 home_->set_ink_drop_base_color(normal_color); |
| 784 app_menu_button_->set_ink_drop_base_color(normal_color); |
| 780 } else { | 785 } else { |
| 781 back_->SetImage(views::Button::STATE_NORMAL, | 786 back_->SetImage(views::Button::STATE_NORMAL, |
| 782 *(tp->GetImageSkiaNamed(IDR_BACK))); | 787 *(tp->GetImageSkiaNamed(IDR_BACK))); |
| 783 back_->SetImage(views::Button::STATE_DISABLED, | 788 back_->SetImage(views::Button::STATE_DISABLED, |
| 784 *(tp->GetImageSkiaNamed(IDR_BACK_D))); | 789 *(tp->GetImageSkiaNamed(IDR_BACK_D))); |
| 785 forward_->SetImage(views::Button::STATE_NORMAL, | 790 forward_->SetImage(views::Button::STATE_NORMAL, |
| 786 *(tp->GetImageSkiaNamed(IDR_FORWARD))); | 791 *(tp->GetImageSkiaNamed(IDR_FORWARD))); |
| 787 forward_->SetImage(views::Button::STATE_DISABLED, | 792 forward_->SetImage(views::Button::STATE_DISABLED, |
| 788 *(tp->GetImageSkiaNamed(IDR_FORWARD_D))); | 793 *(tp->GetImageSkiaNamed(IDR_FORWARD_D))); |
| 789 home_->SetImage(views::Button::STATE_NORMAL, | 794 home_->SetImage(views::Button::STATE_NORMAL, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 811 void ToolbarView::OnShowHomeButtonChanged() { | 816 void ToolbarView::OnShowHomeButtonChanged() { |
| 812 Layout(); | 817 Layout(); |
| 813 SchedulePaint(); | 818 SchedulePaint(); |
| 814 } | 819 } |
| 815 | 820 |
| 816 int ToolbarView::content_shadow_height() const { | 821 int ToolbarView::content_shadow_height() const { |
| 817 return GetLayoutConstant( | 822 return GetLayoutConstant( |
| 818 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? | 823 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? |
| 819 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); | 824 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); |
| 820 } | 825 } |
| OLD | NEW |