| 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 AddSeparator(ui::NORMAL_SEPARATOR); | 207 AddSeparator(ui::NORMAL_SEPARATOR); |
| 208 } | 208 } |
| 209 | 209 |
| 210 AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); | 210 AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); |
| 211 | 211 |
| 212 if (chrome::CanOpenTaskManager()) | 212 if (chrome::CanOpenTaskManager()) |
| 213 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 213 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 214 | 214 |
| 215 AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA); | 215 AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA); |
| 216 | 216 |
| 217 #if defined(OS_CHROMEOS) |
| 218 AddItemWithStringId(IDC_TAKE_SCREENSHOT, IDS_TAKE_SCREENSHOT); |
| 219 #endif |
| 220 |
| 217 AddSeparator(ui::NORMAL_SEPARATOR); | 221 AddSeparator(ui::NORMAL_SEPARATOR); |
| 218 | 222 |
| 219 #if defined(GOOGLE_CHROME_BUILD) | 223 #if defined(GOOGLE_CHROME_BUILD) |
| 220 #if !defined(OS_CHROMEOS) | 224 #if !defined(OS_CHROMEOS) |
| 221 // Show IDC_FEEDBACK in "Tools" menu for non-ChromeOS platforms. | 225 // Show IDC_FEEDBACK in "Tools" menu for non-ChromeOS platforms. |
| 222 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); | 226 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); |
| 223 AddSeparator(ui::NORMAL_SEPARATOR); | 227 AddSeparator(ui::NORMAL_SEPARATOR); |
| 224 #endif | 228 #endif |
| 225 #endif // GOOGLE_CHROME_BUILD | 229 #endif // GOOGLE_CHROME_BUILD |
| 226 | 230 |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 &enable_increment, &enable_decrement); | 787 &enable_increment, &enable_decrement); |
| 784 } | 788 } |
| 785 zoom_label_ = l10n_util::GetStringFUTF16( | 789 zoom_label_ = l10n_util::GetStringFUTF16( |
| 786 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); | 790 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); |
| 787 } | 791 } |
| 788 | 792 |
| 789 void WrenchMenuModel::OnZoomLevelChanged( | 793 void WrenchMenuModel::OnZoomLevelChanged( |
| 790 const content::HostZoomMap::ZoomLevelChange& change) { | 794 const content::HostZoomMap::ZoomLevelChange& change) { |
| 791 UpdateZoomControls(); | 795 UpdateZoomControls(); |
| 792 } | 796 } |
| OLD | NEW |