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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
498 browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) { | 498 browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) { |
499 const string16 short_product_name = | 499 const string16 short_product_name = |
500 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME); | 500 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME); |
501 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16( | 501 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16( |
502 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name)); | 502 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name)); |
503 AddSeparator(); | 503 AddSeparator(); |
504 } | 504 } |
505 | 505 |
506 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); | 506 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); |
507 | 507 |
508 if (!is_touch_menu) { | 508 // On ChormeOS-Touch, we don't want the about/background pages menu options. |
Ben Goodger (Google)
2012/08/09 21:24:10
ChromeOS
MAD
2012/08/09 21:45:32
D'Ho!ne. :-)
| |
509 #if defined(OS_CHROMEOS) | |
510 if (!is_touch_menu) | |
511 #endif | |
512 { | |
509 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT)); | 513 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT)); |
510 string16 num_background_pages = base::FormatNumber( | 514 string16 num_background_pages = base::FormatNumber( |
511 TaskManager::GetBackgroundPageCount()); | 515 TaskManager::GetBackgroundPageCount()); |
512 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( | 516 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( |
513 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); | 517 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); |
514 } | 518 } |
515 | 519 |
516 if (browser_defaults::kShowUpgradeMenuItem) | 520 if (browser_defaults::kShowUpgradeMenuItem) |
517 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW)); | 521 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW)); |
518 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( | 522 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
639 zoom_label_ = l10n_util::GetStringFUTF16( | 643 zoom_label_ = l10n_util::GetStringFUTF16( |
640 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 644 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
641 } | 645 } |
642 | 646 |
643 string16 WrenchMenuModel::GetSyncMenuLabel() const { | 647 string16 WrenchMenuModel::GetSyncMenuLabel() const { |
644 Profile* profile = browser_->profile()->GetOriginalProfile(); | 648 Profile* profile = browser_->profile()->GetOriginalProfile(); |
645 return sync_ui_util::GetSyncMenuLabel( | 649 return sync_ui_util::GetSyncMenuLabel( |
646 ProfileSyncServiceFactory::GetForProfile(profile), | 650 ProfileSyncServiceFactory::GetForProfile(profile), |
647 *SigninManagerFactory::GetForProfile(profile)); | 651 *SigninManagerFactory::GetForProfile(profile)); |
648 } | 652 } |
OLD | NEW |