| 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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 views::Button::STATE_NORMAL, | 780 views::Button::STATE_NORMAL, |
| 781 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 781 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, |
| 782 normal_color)); | 782 normal_color)); |
| 783 forward_->SetImage( | 783 forward_->SetImage( |
| 784 views::Button::STATE_DISABLED, | 784 views::Button::STATE_DISABLED, |
| 785 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, | 785 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, |
| 786 disabled_color)); | 786 disabled_color)); |
| 787 home_->SetImage(views::Button::STATE_NORMAL, | 787 home_->SetImage(views::Button::STATE_NORMAL, |
| 788 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, | 788 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, |
| 789 kButtonSize, normal_color)); | 789 kButtonSize, normal_color)); |
| 790 app_menu_button_->SetImage(views::Button::STATE_NORMAL, | 790 app_menu_button_->UpdateIcon(); |
| 791 gfx::CreateVectorIcon( | |
| 792 gfx::VectorIconId::BROWSER_TOOLS, | |
| 793 kButtonSize, normal_color)); | |
| 794 } else { | 791 } else { |
| 795 back_->SetImage(views::Button::STATE_NORMAL, | 792 back_->SetImage(views::Button::STATE_NORMAL, |
| 796 *(tp->GetImageSkiaNamed(IDR_BACK))); | 793 *(tp->GetImageSkiaNamed(IDR_BACK))); |
| 797 back_->SetImage(views::Button::STATE_DISABLED, | 794 back_->SetImage(views::Button::STATE_DISABLED, |
| 798 *(tp->GetImageSkiaNamed(IDR_BACK_D))); | 795 *(tp->GetImageSkiaNamed(IDR_BACK_D))); |
| 799 forward_->SetImage(views::Button::STATE_NORMAL, | 796 forward_->SetImage(views::Button::STATE_NORMAL, |
| 800 *(tp->GetImageSkiaNamed(IDR_FORWARD))); | 797 *(tp->GetImageSkiaNamed(IDR_FORWARD))); |
| 801 forward_->SetImage(views::Button::STATE_DISABLED, | 798 forward_->SetImage(views::Button::STATE_DISABLED, |
| 802 *(tp->GetImageSkiaNamed(IDR_FORWARD_D))); | 799 *(tp->GetImageSkiaNamed(IDR_FORWARD_D))); |
| 803 home_->SetImage(views::Button::STATE_NORMAL, | 800 home_->SetImage(views::Button::STATE_NORMAL, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 825 void ToolbarView::OnShowHomeButtonChanged() { | 822 void ToolbarView::OnShowHomeButtonChanged() { |
| 826 Layout(); | 823 Layout(); |
| 827 SchedulePaint(); | 824 SchedulePaint(); |
| 828 } | 825 } |
| 829 | 826 |
| 830 int ToolbarView::content_shadow_height() const { | 827 int ToolbarView::content_shadow_height() const { |
| 831 return GetLayoutConstant( | 828 return GetLayoutConstant( |
| 832 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? | 829 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? |
| 833 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); | 830 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); |
| 834 } | 831 } |
| OLD | NEW |