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

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

Issue 5514001: Crash fix + OS specific ss's enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved TODO to the h file from the cc file. Created 10 years 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 | « chrome/browser/ui/views/browser_dialogs.h ('k') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/wrench_menu_model.h" 5 #include "chrome/browser/wrench_menu_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 AddItemWithStringId(IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS); 181 AddItemWithStringId(IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS);
182 #endif 182 #endif
183 AddSeparator(); 183 AddSeparator();
184 #endif 184 #endif
185 185
186 AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); 186 AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
187 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 187 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
188 AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA); 188 AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
189 189
190 AddSeparator(); 190 AddSeparator();
191 #if defined(OS_CHROMEOS) 191 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
192 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK); 192 AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
193 AddSeparator(); 193 AddSeparator();
194 #endif 194 #endif
195 195
196 encoding_menu_model_.reset(new EncodingMenuModel(browser)); 196 encoding_menu_model_.reset(new EncodingMenuModel(browser));
197 AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU, 197 AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
198 encoding_menu_model_.get()); 198 encoding_menu_model_.get());
199 AddItemWithStringId(IDC_VIEW_SOURCE, IDS_VIEW_SOURCE); 199 AddItemWithStringId(IDC_VIEW_SOURCE, IDS_VIEW_SOURCE);
200 if (g_browser_process->have_inspector_files()) { 200 if (g_browser_process->have_inspector_files()) {
201 AddItemWithStringId(IDC_DEV_TOOLS, IDS_DEV_TOOLS); 201 AddItemWithStringId(IDC_DEV_TOOLS, IDS_DEV_TOOLS);
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 &enable_increment, &enable_decrement); 530 &enable_increment, &enable_decrement);
531 } 531 }
532 zoom_label_ = l10n_util::GetStringFUTF16( 532 zoom_label_ = l10n_util::GetStringFUTF16(
533 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 533 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
534 } 534 }
535 535
536 string16 WrenchMenuModel::GetSyncMenuLabel() const { 536 string16 WrenchMenuModel::GetSyncMenuLabel() const {
537 return sync_ui_util::GetSyncMenuLabel( 537 return sync_ui_util::GetSyncMenuLabel(
538 browser_->profile()->GetOriginalProfile()->GetProfileSyncService()); 538 browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
539 } 539 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_dialogs.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698