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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16( 577 AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
578 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name)); 578 IDS_SYNC_MENU_PRE_SYNCED_LABEL, short_product_name));
579 AddSeparator(ui::NORMAL_SEPARATOR); 579 AddSeparator(ui::NORMAL_SEPARATOR);
580 } 580 }
581 #endif 581 #endif
582 582
583 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); 583 AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
584 584
585 #if defined(OS_CHROMEOS) 585 #if defined(OS_CHROMEOS)
586 if (CommandLine::ForCurrentProcess()->HasSwitch( 586 if (CommandLine::ForCurrentProcess()->HasSwitch(
587 switches::kEnableRequestTabletSite)) 587 chromeos::switches::kEnableRequestTabletSite))
588 AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE, 588 AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
589 IDS_TOGGLE_REQUEST_TABLET_SITE); 589 IDS_TOGGLE_REQUEST_TABLET_SITE);
590 #endif 590 #endif
591 591
592 // On ChromeOS-Touch, we don't want the about/background pages menu options. 592 // On ChromeOS-Touch, we don't want the about/background pages menu options.
593 #if defined(OS_CHROMEOS) 593 #if defined(OS_CHROMEOS)
594 if (!is_new_menu) 594 if (!is_new_menu)
595 #endif 595 #endif
596 { 596 {
597 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT)); 597 AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 &enable_increment, &enable_decrement); 759 &enable_increment, &enable_decrement);
760 } 760 }
761 zoom_label_ = l10n_util::GetStringFUTF16( 761 zoom_label_ = l10n_util::GetStringFUTF16(
762 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 762 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
763 } 763 }
764 764
765 void WrenchMenuModel::OnZoomLevelChanged( 765 void WrenchMenuModel::OnZoomLevelChanged(
766 const content::HostZoomMap::ZoomLevelChange& change) { 766 const content::HostZoomMap::ZoomLevelChange& change) {
767 UpdateZoomControls(); 767 UpdateZoomControls();
768 } 768 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/event_rewriter_unittest.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698