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

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

Issue 2624973002: Fix typo from crrev.com/01876af8d286f290fc12baeae8e4ac08913b9b90 (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 const SkColor normal_color = 744 const SkColor normal_color =
745 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON); 745 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
746 const SkColor disabled_color = 746 const SkColor disabled_color =
747 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE); 747 tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
748 748
749 back_->SetImage( 749 back_->SetImage(
750 views::Button::STATE_NORMAL, 750 views::Button::STATE_NORMAL,
751 gfx::CreateVectorIcon(kNavigateBackIcon, normal_color)); 751 gfx::CreateVectorIcon(kNavigateBackIcon, normal_color));
752 back_->SetImage( 752 back_->SetImage(
753 views::Button::STATE_DISABLED, 753 views::Button::STATE_DISABLED,
754 gfx::CreateVectorIcon(kNavigateBackIcon, normal_color)); 754 gfx::CreateVectorIcon(kNavigateBackIcon, disabled_color));
755 forward_->SetImage( 755 forward_->SetImage(
756 views::Button::STATE_NORMAL, 756 views::Button::STATE_NORMAL,
757 gfx::CreateVectorIcon(kNavigateForwardIcon, normal_color)); 757 gfx::CreateVectorIcon(kNavigateForwardIcon, normal_color));
758 forward_->SetImage( 758 forward_->SetImage(
759 views::Button::STATE_DISABLED, 759 views::Button::STATE_DISABLED,
760 gfx::CreateVectorIcon(kNavigateForwardIcon, disabled_color)); 760 gfx::CreateVectorIcon(kNavigateForwardIcon, disabled_color));
761 home_->SetImage(views::Button::STATE_NORMAL, 761 home_->SetImage(views::Button::STATE_NORMAL,
762 gfx::CreateVectorIcon(kNavigateHomeIcon, normal_color)); 762 gfx::CreateVectorIcon(kNavigateHomeIcon, normal_color));
763 app_menu_button_->UpdateIcon(); 763 app_menu_button_->UpdateIcon();
764 764
(...skipping 16 matching lines...) Expand all
781 if (OutdatedUpgradeBubbleView::IsAvailable()) { 781 if (OutdatedUpgradeBubbleView::IsAvailable()) {
782 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, 782 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
783 auto_update_enabled); 783 auto_update_enabled);
784 } 784 }
785 } 785 }
786 786
787 void ToolbarView::OnShowHomeButtonChanged() { 787 void ToolbarView::OnShowHomeButtonChanged() {
788 Layout(); 788 Layout();
789 SchedulePaint(); 789 SchedulePaint();
790 } 790 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698