| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_view.h" | 5 #include "chrome/browser/ui/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include "base/i18n/number_formatting.h" | 7 #include "base/i18n/number_formatting.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
| 14 #include "chrome/browser/ui/global_error_service.h" | 14 #include "chrome/browser/ui/global_error_service.h" |
| 15 #include "chrome/browser/ui/global_error_service_factory.h" | 15 #include "chrome/browser/ui/global_error_service_factory.h" |
| 16 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 16 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 17 #include "chrome/browser/ui/view_ids.h" | 17 #include "chrome/browser/ui/view_ids.h" |
| 18 #include "chrome/browser/ui/views/browser_actions_container.h" | 18 #include "chrome/browser/ui/views/browser_actions_container.h" |
| 19 #include "chrome/browser/ui/views/event_utils.h" | 19 #include "chrome/browser/ui/views/event_utils.h" |
| 20 #include "chrome/browser/ui/views/window.h" |
| 20 #include "chrome/browser/ui/views/wrench_menu.h" | 21 #include "chrome/browser/ui/views/wrench_menu.h" |
| 21 #include "chrome/browser/upgrade_detector.h" | 22 #include "chrome/browser/upgrade_detector.h" |
| 22 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
| 23 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
| 24 #include "content/browser/accessibility/browser_accessibility_state.h" | 25 #include "content/browser/accessibility/browser_accessibility_state.h" |
| 25 #include "content/browser/user_metrics.h" | 26 #include "content/browser/user_metrics.h" |
| 26 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
| 27 #include "grit/chromium_strings.h" | 28 #include "grit/chromium_strings.h" |
| 28 #include "grit/generated_resources.h" | 29 #include "grit/generated_resources.h" |
| 29 #include "grit/theme_resources.h" | 30 #include "grit/theme_resources.h" |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 | 725 |
| 725 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); | 726 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); |
| 726 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); | 727 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); |
| 727 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); | 728 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); |
| 728 } | 729 } |
| 729 | 730 |
| 730 void ToolbarView::ShowCriticalNotification() { | 731 void ToolbarView::ShowCriticalNotification() { |
| 731 #if defined(OS_WIN) | 732 #if defined(OS_WIN) |
| 732 CriticalNotificationBubbleView* bubble_delegate = | 733 CriticalNotificationBubbleView* bubble_delegate = |
| 733 new CriticalNotificationBubbleView(app_menu_); | 734 new CriticalNotificationBubbleView(app_menu_); |
| 734 views::BubbleDelegateView::CreateBubble(bubble_delegate); | 735 browser::CreateViewsBubble(bubble_delegate); |
| 735 bubble_delegate->StartFade(true); | 736 bubble_delegate->StartFade(true); |
| 736 #endif | 737 #endif |
| 737 } | 738 } |
| 738 | 739 |
| 739 void ToolbarView::UpdateAppMenuState() { | 740 void ToolbarView::UpdateAppMenuState() { |
| 740 string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP); | 741 string16 accname_app = l10n_util::GetStringUTF16(IDS_ACCNAME_APP); |
| 741 if (IsUpgradeRecommended()) { | 742 if (IsUpgradeRecommended()) { |
| 742 accname_app = l10n_util::GetStringFUTF16( | 743 accname_app = l10n_util::GetStringFUTF16( |
| 743 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app); | 744 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app); |
| 744 } | 745 } |
| 745 app_menu_->SetAccessibleName(accname_app); | 746 app_menu_->SetAccessibleName(accname_app); |
| 746 | 747 |
| 747 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); | 748 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); |
| 748 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); | 749 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); |
| 749 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); | 750 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); |
| 750 SchedulePaint(); | 751 SchedulePaint(); |
| 751 } | 752 } |
| OLD | NEW |