Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.cc

Issue 1724963002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky review Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, 754 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
755 normal_color)); 755 normal_color));
756 forward_->SetImage( 756 forward_->SetImage(
757 views::Button::STATE_DISABLED, 757 views::Button::STATE_DISABLED,
758 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize, 758 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD, kButtonSize,
759 disabled_color)); 759 disabled_color));
760 home_->SetImage(views::Button::STATE_NORMAL, 760 home_->SetImage(views::Button::STATE_NORMAL,
761 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME, 761 gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,
762 kButtonSize, normal_color)); 762 kButtonSize, normal_color));
763 app_menu_button_->UpdateIcon(); 763 app_menu_button_->UpdateIcon();
764
765 back_->set_ink_drop_base_color(normal_color);
766 forward_->set_ink_drop_base_color(normal_color);
767 home_->set_ink_drop_base_color(normal_color);
768 app_menu_button_->set_ink_drop_base_color(normal_color);
764 } else { 769 } else {
765 back_->SetImage(views::Button::STATE_NORMAL, 770 back_->SetImage(views::Button::STATE_NORMAL,
766 *(tp->GetImageSkiaNamed(IDR_BACK))); 771 *(tp->GetImageSkiaNamed(IDR_BACK)));
767 back_->SetImage(views::Button::STATE_DISABLED, 772 back_->SetImage(views::Button::STATE_DISABLED,
768 *(tp->GetImageSkiaNamed(IDR_BACK_D))); 773 *(tp->GetImageSkiaNamed(IDR_BACK_D)));
769 forward_->SetImage(views::Button::STATE_NORMAL, 774 forward_->SetImage(views::Button::STATE_NORMAL,
770 *(tp->GetImageSkiaNamed(IDR_FORWARD))); 775 *(tp->GetImageSkiaNamed(IDR_FORWARD)));
771 forward_->SetImage(views::Button::STATE_DISABLED, 776 forward_->SetImage(views::Button::STATE_DISABLED,
772 *(tp->GetImageSkiaNamed(IDR_FORWARD_D))); 777 *(tp->GetImageSkiaNamed(IDR_FORWARD_D)));
773 home_->SetImage(views::Button::STATE_NORMAL, 778 home_->SetImage(views::Button::STATE_NORMAL,
(...skipping 21 matching lines...) Expand all
795 void ToolbarView::OnShowHomeButtonChanged() { 800 void ToolbarView::OnShowHomeButtonChanged() {
796 Layout(); 801 Layout();
797 SchedulePaint(); 802 SchedulePaint();
798 } 803 }
799 804
800 int ToolbarView::content_shadow_height() const { 805 int ToolbarView::content_shadow_height() const {
801 return GetLayoutConstant( 806 return GetLayoutConstant(
802 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? 807 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
803 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); 808 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
804 } 809 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.cc ('k') | ui/views/animation/ink_drop_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698