OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/toolbar/wrench_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 #endif | 74 #endif |
75 | 75 |
76 using content::HostZoomMap; | 76 using content::HostZoomMap; |
77 using content::UserMetricsAction; | 77 using content::UserMetricsAction; |
78 using content::WebContents; | 78 using content::WebContents; |
79 | 79 |
80 namespace { | 80 namespace { |
81 // Maximum width of a username - we trim emails that are wider than this so | 81 // Maximum width of a username - we trim emails that are wider than this so |
82 // the wrench menu doesn't get ridiculously wide. | 82 // the wrench menu doesn't get ridiculously wide. |
83 const int kUsernameMaxWidth = 200; | 83 const int kUsernameMaxWidth = 200; |
| 84 |
| 85 // Conditionally return the update app menu item title based on upgrade detector |
| 86 // state. |
| 87 string16 GetUpgradeDialogMenuItemName() { |
| 88 if (UpgradeDetector::GetInstance()->IsOutdatedInstall()) { |
| 89 return l10n_util::GetStringFUTF16( |
| 90 IDS_UPGRADE_BUBBLE_MENU_ITEM, |
| 91 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); |
| 92 } else { |
| 93 return l10n_util::GetStringUTF16(IDS_UPDATE_NOW); |
| 94 } |
| 95 } |
84 } // namespace | 96 } // namespace |
85 | 97 |
86 //////////////////////////////////////////////////////////////////////////////// | 98 //////////////////////////////////////////////////////////////////////////////// |
87 // EncodingMenuModel | 99 // EncodingMenuModel |
88 | 100 |
89 EncodingMenuModel::EncodingMenuModel(Browser* browser) | 101 EncodingMenuModel::EncodingMenuModel(Browser* browser) |
90 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), | 102 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), |
91 browser_(browser) { | 103 browser_(browser) { |
92 Build(); | 104 Build(); |
93 } | 105 } |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 return l10n_util::GetStringUTF16(string_id); | 297 return l10n_util::GetStringUTF16(string_id); |
286 } | 298 } |
287 #endif | 299 #endif |
288 case IDC_VIEW_BACKGROUND_PAGES: { | 300 case IDC_VIEW_BACKGROUND_PAGES: { |
289 string16 num_background_pages = base::FormatNumber( | 301 string16 num_background_pages = base::FormatNumber( |
290 TaskManager::GetBackgroundPageCount()); | 302 TaskManager::GetBackgroundPageCount()); |
291 return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES, | 303 return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES, |
292 num_background_pages); | 304 num_background_pages); |
293 } | 305 } |
294 case IDC_UPGRADE_DIALOG: | 306 case IDC_UPGRADE_DIALOG: |
295 return l10n_util::GetStringUTF16(IDS_UPDATE_NOW); | 307 return GetUpgradeDialogMenuItemName(); |
296 case IDC_SHOW_SIGNIN: { | 308 case IDC_SHOW_SIGNIN: { |
297 GlobalError* error = GetActiveSignedInServiceError(); | 309 GlobalError* error = GetActiveSignedInServiceError(); |
298 if (error) | 310 if (error) |
299 return error->MenuItemLabel(); | 311 return error->MenuItemLabel(); |
300 | 312 |
301 // No errors, so just display the signed in user, if any. | 313 // No errors, so just display the signed in user, if any. |
302 Profile* profile = browser_->profile()->GetOriginalProfile(); | 314 Profile* profile = browser_->profile()->GetOriginalProfile(); |
303 ProfileSyncService* service = profile->IsSyncAccessible() ? | 315 ProfileSyncService* service = profile->IsSyncAccessible() ? |
304 ProfileSyncServiceFactory::GetForProfile(profile) : NULL; | 316 ProfileSyncServiceFactory::GetForProfile(profile) : NULL; |
305 | 317 |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 // We use the task manager to show background pages. | 610 // We use the task manager to show background pages. |
599 if (chrome::CanOpenTaskManager()) { | 611 if (chrome::CanOpenTaskManager()) { |
600 string16 num_background_pages = base::FormatNumber( | 612 string16 num_background_pages = base::FormatNumber( |
601 TaskManager::GetBackgroundPageCount()); | 613 TaskManager::GetBackgroundPageCount()); |
602 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( | 614 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( |
603 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); | 615 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); |
604 } | 616 } |
605 } | 617 } |
606 | 618 |
607 if (browser_defaults::kShowUpgradeMenuItem) | 619 if (browser_defaults::kShowUpgradeMenuItem) |
608 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW)); | 620 AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName()); |
| 621 |
609 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( | 622 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( |
610 IDS_VIEW_INCOMPATIBILITIES)); | 623 IDS_VIEW_INCOMPATIBILITIES)); |
611 | 624 |
612 #if defined(OS_WIN) | 625 #if defined(OS_WIN) |
613 SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES), | 626 SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES), |
614 ui::ResourceBundle::GetSharedInstance(). | 627 ui::ResourceBundle::GetSharedInstance(). |
615 GetNativeImageNamed(IDR_CONFLICT_MENU)); | 628 GetNativeImageNamed(IDR_CONFLICT_MENU)); |
616 #endif | 629 #endif |
617 | 630 |
618 if (!is_new_menu) { | 631 if (!is_new_menu) { |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 // registration framework. | 762 // registration framework. |
750 if (profile->IsSyncAccessible()) { | 763 if (profile->IsSyncAccessible()) { |
751 ProfileSyncService* service = | 764 ProfileSyncService* service = |
752 ProfileSyncServiceFactory::GetForProfile(profile); | 765 ProfileSyncServiceFactory::GetForProfile(profile); |
753 SyncGlobalError* error = service->sync_global_error(); | 766 SyncGlobalError* error = service->sync_global_error(); |
754 if (error && error->HasBadge()) | 767 if (error && error->HasBadge()) |
755 return error; | 768 return error; |
756 } | 769 } |
757 return NULL; | 770 return NULL; |
758 } | 771 } |
OLD | NEW |