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

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

Issue 7011052: Revert 85330 - GTK: Bring global menu out of about:flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 kOsWin, 269 kOsWin,
270 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) 270 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu)
271 }, 271 },
272 { 272 {
273 "ppapi-flash-in-process", 273 "ppapi-flash-in-process",
274 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, 274 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME,
275 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, 275 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION,
276 kOsAll, 276 kOsAll,
277 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) 277 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess)
278 }, 278 },
279 #if defined(TOOLKIT_GTK)
280 {
281 "global-gnome-menu",
282 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_NAME,
283 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_DESCRIPTION,
284 kOsLinux,
285 SINGLE_VALUE_TYPE(switches::kGlobalGnomeMenu)
286 },
287 #endif
279 { 288 {
280 "enable-vpn", 289 "enable-vpn",
281 IDS_FLAGS_ENABLE_VPN_NAME, 290 IDS_FLAGS_ENABLE_VPN_NAME,
282 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, 291 IDS_FLAGS_ENABLE_VPN_DESCRIPTION,
283 kOsCrOS, 292 kOsCrOS,
284 #if defined(OS_CHROMEOS) 293 #if defined(OS_CHROMEOS)
285 // The switch exists only on Chrome OS. 294 // The switch exists only on Chrome OS.
286 SINGLE_VALUE_TYPE(switches::kEnableVPN) 295 SINGLE_VALUE_TYPE(switches::kEnableVPN)
287 #else 296 #else
288 SINGLE_VALUE_TYPE("") 297 SINGLE_VALUE_TYPE("")
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 } 733 }
725 734
726 const Experiment* GetExperiments(size_t* count) { 735 const Experiment* GetExperiments(size_t* count) {
727 *count = num_experiments; 736 *count = num_experiments;
728 return experiments; 737 return experiments;
729 } 738 }
730 739
731 } // namespace testing 740 } // namespace testing
732 741
733 } // namespace about_flags 742 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698