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

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

Issue 2789203003: [Views] App Menu Animated Icon (Closed)
Patch Set: nit Created 3 years, 8 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 | « chrome/browser/ui/views/toolbar/app_menu_button.cc ('k') | chrome/common/chrome_switches.h » ('j') | 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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 back_->SetImage(views::Button::STATE_DISABLED, 741 back_->SetImage(views::Button::STATE_DISABLED,
742 gfx::CreateVectorIcon(ui::kBackArrowIcon, disabled_color)); 742 gfx::CreateVectorIcon(ui::kBackArrowIcon, disabled_color));
743 forward_->SetImage( 743 forward_->SetImage(
744 views::Button::STATE_NORMAL, 744 views::Button::STATE_NORMAL,
745 gfx::CreateVectorIcon(ui::kForwardArrowIcon, normal_color)); 745 gfx::CreateVectorIcon(ui::kForwardArrowIcon, normal_color));
746 forward_->SetImage( 746 forward_->SetImage(
747 views::Button::STATE_DISABLED, 747 views::Button::STATE_DISABLED,
748 gfx::CreateVectorIcon(ui::kForwardArrowIcon, disabled_color)); 748 gfx::CreateVectorIcon(ui::kForwardArrowIcon, disabled_color));
749 home_->SetImage(views::Button::STATE_NORMAL, 749 home_->SetImage(views::Button::STATE_NORMAL,
750 gfx::CreateVectorIcon(kNavigateHomeIcon, normal_color)); 750 gfx::CreateVectorIcon(kNavigateHomeIcon, normal_color));
751 app_menu_button_->UpdateIcon(); 751 app_menu_button_->UpdateIcon(false);
752 752
753 back_->set_ink_drop_base_color(normal_color); 753 back_->set_ink_drop_base_color(normal_color);
754 forward_->set_ink_drop_base_color(normal_color); 754 forward_->set_ink_drop_base_color(normal_color);
755 home_->set_ink_drop_base_color(normal_color); 755 home_->set_ink_drop_base_color(normal_color);
756 app_menu_button_->set_ink_drop_base_color(normal_color); 756 app_menu_button_->set_ink_drop_base_color(normal_color);
757 757
758 reload_->LoadImages(); 758 reload_->LoadImages();
759 } 759 }
760 760
761 void ToolbarView::ShowCriticalNotification() { 761 void ToolbarView::ShowCriticalNotification() {
762 #if defined(OS_WIN) 762 #if defined(OS_WIN)
763 views::BubbleDialogDelegateView::CreateBubble( 763 views::BubbleDialogDelegateView::CreateBubble(
764 new CriticalNotificationBubbleView(app_menu_button_))->Show(); 764 new CriticalNotificationBubbleView(app_menu_button_))->Show();
765 #endif 765 #endif
766 } 766 }
767 767
768 void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) { 768 void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) {
769 if (OutdatedUpgradeBubbleView::IsAvailable()) { 769 if (OutdatedUpgradeBubbleView::IsAvailable()) {
770 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, 770 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
771 auto_update_enabled); 771 auto_update_enabled);
772 } 772 }
773 } 773 }
774 774
775 void ToolbarView::OnShowHomeButtonChanged() { 775 void ToolbarView::OnShowHomeButtonChanged() {
776 Layout(); 776 Layout();
777 SchedulePaint(); 777 SchedulePaint();
778 } 778 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu_button.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698