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

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

Issue 10825281: Re-Enable the About menu option on non-cros-touch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a comment typo Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) { 497 browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
498 const string16 short_product_name = 498 const string16 short_product_name =
499 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME); 499 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
500 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16( 500 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
501 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name)); 501 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name));
502 AddSeparator(); 502 AddSeparator();
503 } 503 }
504 504
505 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); 505 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
506 506
507 if (!is_touch_menu) { 507 // On ChromeOS-Touch, we don't want the about/background pages menu options.
508 #if defined(OS_CHROMEOS)
509 if (!is_touch_menu)
510 #endif
511 {
508 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT)); 512 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
509 string16 num_background_pages = base::FormatNumber( 513 string16 num_background_pages = base::FormatNumber(
510 TaskManager::GetBackgroundPageCount()); 514 TaskManager::GetBackgroundPageCount());
511 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16( 515 AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
512 IDS_VIEW_BACKGROUND_PAGES, num_background_pages)); 516 IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
513 } 517 }
514 518
515 if (browser_defaults::kShowUpgradeMenuItem) 519 if (browser_defaults::kShowUpgradeMenuItem)
516 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW)); 520 AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
517 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16( 521 AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 zoom_label_ = l10n_util::GetStringFUTF16( 642 zoom_label_ = l10n_util::GetStringFUTF16(
639 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 643 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
640 } 644 }
641 645
642 string16 WrenchMenuModel::GetSyncMenuLabel() const { 646 string16 WrenchMenuModel::GetSyncMenuLabel() const {
643 Profile* profile = browser_->profile()->GetOriginalProfile(); 647 Profile* profile = browser_->profile()->GetOriginalProfile();
644 return sync_ui_util::GetSyncMenuLabel( 648 return sync_ui_util::GetSyncMenuLabel(
645 ProfileSyncServiceFactory::GetForProfile(profile), 649 ProfileSyncServiceFactory::GetForProfile(profile),
646 *SigninManagerFactory::GetForProfile(profile)); 650 *SigninManagerFactory::GetForProfile(profile));
647 } 651 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698