OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/wrench_menu_model.h" | 5 #include "chrome/browser/wrench_menu_model.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 IDS_ABOUT, product_name)); | 418 IDS_ABOUT, product_name)); |
419 } | 419 } |
420 | 420 |
421 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringFUTF16( | 421 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringFUTF16( |
422 IDS_UPDATE_NOW, product_name)); | 422 IDS_UPDATE_NOW, product_name)); |
423 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( | 423 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( |
424 IDS_VIEW_INCOMPATIBILITIES)); | 424 IDS_VIEW_INCOMPATIBILITIES)); |
425 | 425 |
426 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 426 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
427 SetIcon(GetIndexOfCommandId(IDC_UPGRADE_DIALOG), | 427 SetIcon(GetIndexOfCommandId(IDC_UPGRADE_DIALOG), |
428 *rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE)); | 428 *rb.GetBitmapNamed(IDR_UPDATE_MENU)); |
| 429 #if defined(OS_WIN) |
| 430 SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES), |
| 431 *rb.GetBitmapNamed(IDR_CONFLICT_MENU)); |
| 432 #endif |
429 | 433 |
430 AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 434 AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |
431 if (browser_defaults::kShowExitMenuItem) { | 435 if (browser_defaults::kShowExitMenuItem) { |
432 AddSeparator(); | 436 AddSeparator(); |
433 #if defined(OS_CHROMEOS) | 437 #if defined(OS_CHROMEOS) |
434 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { | 438 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { |
435 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE); | 439 AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE); |
436 } else { | 440 } else { |
437 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT); | 441 AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT); |
438 } | 442 } |
(...skipping 28 matching lines...) Expand all Loading... |
467 &enable_increment, &enable_decrement); | 471 &enable_increment, &enable_decrement); |
468 } | 472 } |
469 zoom_label_ = l10n_util::GetStringFUTF16( | 473 zoom_label_ = l10n_util::GetStringFUTF16( |
470 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 474 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
471 } | 475 } |
472 | 476 |
473 string16 WrenchMenuModel::GetSyncMenuLabel() const { | 477 string16 WrenchMenuModel::GetSyncMenuLabel() const { |
474 return sync_ui_util::GetSyncMenuLabel( | 478 return sync_ui_util::GetSyncMenuLabel( |
475 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); | 479 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); |
476 } | 480 } |
OLD | NEW |