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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 11440020: Add an outdated upgrade bubble view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed OWNERS comments... Created 7 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 | Annotate | Revision Log
OLDNEW
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #endif 63 #endif
64 64
65 #if defined(USE_ASH) 65 #if defined(USE_ASH)
66 #include "ash/shell.h" 66 #include "ash/shell.h"
67 #endif 67 #endif
68 68
69 using content::HostZoomMap; 69 using content::HostZoomMap;
70 using content::UserMetricsAction; 70 using content::UserMetricsAction;
71 using content::WebContents; 71 using content::WebContents;
72 72
73 namespace {
74 // Conditionally return the update app menu item title based on upgrade detector
75 // state.
76 string16 GetUpgradeDialogMenuItemName() {
77 if (UpgradeDetector::GetInstance()->is_outdated_install()) {
78 return l10n_util::GetStringFUTF16(
79 IDS_UPGRADE_BUBBLE_MENU_ITEM,
80 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
81 } else {
82 return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
83 }
84 }
85 } // namespace
86
73 //////////////////////////////////////////////////////////////////////////////// 87 ////////////////////////////////////////////////////////////////////////////////
74 // EncodingMenuModel 88 // EncodingMenuModel
75 89
76 EncodingMenuModel::EncodingMenuModel(Browser* browser) 90 EncodingMenuModel::EncodingMenuModel(Browser* browser)
77 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), 91 : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
78 browser_(browser) { 92 browser_(browser) {
79 Build(); 93 Build();
80 } 94 }
81 95
82 EncodingMenuModel::~EncodingMenuModel() { 96 EncodingMenuModel::~EncodingMenuModel() {
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 return l10n_util::GetStringUTF16(string_id); 292 return l10n_util::GetStringUTF16(string_id);
279 } 293 }
280 #endif 294 #endif
281 case IDC_VIEW_BACKGROUND_PAGES: { 295 case IDC_VIEW_BACKGROUND_PAGES: {
282 string16 num_background_pages = base::FormatNumber( 296 string16 num_background_pages = base::FormatNumber(
283 TaskManager::GetBackgroundPageCount()); 297 TaskManager::GetBackgroundPageCount());
284 return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES, 298 return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
285 num_background_pages); 299 num_background_pages);
286 } 300 }
287 case IDC_UPGRADE_DIALOG: 301 case IDC_UPGRADE_DIALOG:
288 return l10n_util::GetStringUTF16(IDS_UPDATE_NOW); 302 return GetUpgradeDialogMenuItemName();
289 case IDC_SHOW_SIGNIN: 303 case IDC_SHOW_SIGNIN:
290 return signin_ui_util::GetSigninMenuLabel( 304 return signin_ui_util::GetSigninMenuLabel(
291 browser_->profile()->GetOriginalProfile()); 305 browser_->profile()->GetOriginalProfile());
292 default: 306 default:
293 NOTREACHED(); 307 NOTREACHED();
294 return string16(); 308 return string16();
295 } 309 }
296 } 310 }
297 311
298 bool WrenchMenuModel::GetIconForCommandId(int command_id, 312 bool WrenchMenuModel::GetIconForCommandId(int command_id,
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 // We use the task manager to show background pages. 575 // We use the task manager to show background pages.
562 if (chrome::CanOpenTaskManager()) { 576 if (chrome::CanOpenTaskManager()) {
563 string16 num_background_pages = base::FormatNumber( 577 string16 num_background_pages = base::FormatNumber(
564 TaskManager::GetBackgroundPageCount()); 578 TaskManager::GetBackgroundPageCount());
565 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( 579 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
566 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); 580 IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
567 } 581 }
568 } 582 }
569 583
570 if (browser_defaults::kShowUpgradeMenuItem) 584 if (browser_defaults::kShowUpgradeMenuItem)
571 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW)); 585 AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
586
572 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( 587 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
573 IDS_VIEW_INCOMPATIBILITIES)); 588 IDS_VIEW_INCOMPATIBILITIES));
574 589
575 #if defined(OS_WIN) 590 #if defined(OS_WIN)
576 SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES), 591 SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
577 ui::ResourceBundle::GetSharedInstance(). 592 ui::ResourceBundle::GetSharedInstance().
578 GetNativeImageNamed(IDR_CONFLICT_MENU)); 593 GetNativeImageNamed(IDR_CONFLICT_MENU));
579 #endif 594 #endif
580 595
581 if (!is_new_menu) { 596 if (!is_new_menu) {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent( 709 browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent(
695 &enable_increment, &enable_decrement); 710 &enable_increment, &enable_decrement);
696 } 711 }
697 zoom_label_ = l10n_util::GetStringFUTF16( 712 zoom_label_ = l10n_util::GetStringFUTF16(
698 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 713 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
699 } 714 }
700 715
701 void WrenchMenuModel::OnZoomLevelChanged(const std::string& host) { 716 void WrenchMenuModel::OnZoomLevelChanged(const std::string& host) {
702 UpdateZoomControls(); 717 UpdateZoomControls();
703 } 718 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/views/outdated_upgrade_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698