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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
194 : SimpleMenuModel(delegate) { | 194 : SimpleMenuModel(delegate) { |
195 Build(browser); | 195 Build(browser); |
196 } | 196 } |
197 virtual ~HelpMenuModel() { | 197 virtual ~HelpMenuModel() { |
198 } | 198 } |
199 | 199 |
200 private: | 200 private: |
201 void Build(Browser* browser) { | 201 void Build(Browser* browser) { |
202 int help_string_id = IDS_HELP_PAGE; | 202 int help_string_id = IDS_HELP_PAGE; |
203 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) | 203 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) |
204 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 204 help_string_id = IDS_GET_HELP; |
sky
2014/09/17 19:43:25
Use a #else here too.
cylee1
2014/09/18 11:10:30
Done.
| |
205 chromeos::switches::kDisableGeniusApp)) { | |
206 help_string_id = IDS_GET_HELP; | |
207 } | |
208 #endif | 205 #endif |
209 AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id); | 206 AddItemWithStringId(IDC_HELP_PAGE_VIA_MENU, help_string_id); |
210 if (browser_defaults::kShowHelpMenuItemIcon) { | 207 if (browser_defaults::kShowHelpMenuItemIcon) { |
211 ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 208 ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
212 SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU), | 209 SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE_VIA_MENU), |
213 rb.GetNativeImageNamed(IDR_HELP_MENU)); | 210 rb.GetNativeImageNamed(IDR_HELP_MENU)); |
214 } | 211 } |
215 | 212 |
216 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); | 213 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); |
217 } | 214 } |
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
785 ->GetZoomPercent(); | 782 ->GetZoomPercent(); |
786 } | 783 } |
787 zoom_label_ = l10n_util::GetStringFUTF16( | 784 zoom_label_ = l10n_util::GetStringFUTF16( |
788 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 785 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
789 } | 786 } |
790 | 787 |
791 void WrenchMenuModel::OnZoomLevelChanged( | 788 void WrenchMenuModel::OnZoomLevelChanged( |
792 const content::HostZoomMap::ZoomLevelChange& change) { | 789 const content::HostZoomMap::ZoomLevelChange& change) { |
793 UpdateZoomControls(); | 790 UpdateZoomControls(); |
794 } | 791 } |
OLD | NEW |