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

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

Issue 16900002: Added flag for alternate launcher settings (remaining changes to come). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated description and string Created 7 years, 6 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
« no previous file with comments | « chrome/app/generated_resources.grd ('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) 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/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 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 { 899 {
900 "enable-tab-capture", 900 "enable-tab-capture",
901 IDS_ENABLE_TAB_CAPTURE_NAME, 901 IDS_ENABLE_TAB_CAPTURE_NAME,
902 IDS_ENABLE_TAB_CAPTURE_DESCRIPTION, 902 IDS_ENABLE_TAB_CAPTURE_DESCRIPTION,
903 kOsWin | kOsMac | kOsLinux | kOsCrOS, 903 kOsWin | kOsMac | kOsLinux | kOsCrOS,
904 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kTabCapture, "1", 904 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kTabCapture, "1",
905 switches::kTabCapture, "0") 905 switches::kTabCapture, "0")
906 }, 906 },
907 #if defined(OS_CHROMEOS) 907 #if defined(OS_CHROMEOS)
908 { 908 {
909 "ash-use-alt-shelf",
910 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME,
911 IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION,
912 kOsCrOS,
913 SINGLE_VALUE_TYPE(ash::switches::kAshUseAlternateShelfLayout)
914 },
915 {
909 "enable-background-loader", 916 "enable-background-loader",
910 IDS_ENABLE_BACKLOADER_NAME, 917 IDS_ENABLE_BACKLOADER_NAME,
911 IDS_ENABLE_BACKLOADER_DESCRIPTION, 918 IDS_ENABLE_BACKLOADER_DESCRIPTION,
912 kOsCrOS, 919 kOsCrOS,
913 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) 920 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
914 }, 921 },
915 { 922 {
916 "enable-screensaver-extension", 923 "enable-screensaver-extension",
917 IDS_ENABLE_SCREENSAVER_EXTENSION_NAME, 924 IDS_ENABLE_SCREENSAVER_EXTENSION_NAME,
918 IDS_ENABLE_SCREENSAVER_EXTENSION_DESCRIPTION, 925 IDS_ENABLE_SCREENSAVER_EXTENSION_DESCRIPTION,
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
2008 } 2015 }
2009 2016
2010 const Experiment* GetExperiments(size_t* count) { 2017 const Experiment* GetExperiments(size_t* count) {
2011 *count = num_experiments; 2018 *count = num_experiments;
2012 return experiments; 2019 return experiments;
2013 } 2020 }
2014 2021
2015 } // namespace testing 2022 } // namespace testing
2016 2023
2017 } // namespace about_flags 2024 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698