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

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

Issue 12848004: Add shortcut keys to ui scaling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stl hates me Created 7 years, 9 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
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 }; 180 };
181 181
182 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = { 182 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = {
183 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 183 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
184 { IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR, 184 { IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR,
185 switches::kEnableChromeCaptivePortalDetector, ""}, 185 switches::kEnableChromeCaptivePortalDetector, ""},
186 { IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR, 186 { IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR,
187 switches::kDisableChromeCaptivePortalDetector, ""} 187 switches::kDisableChromeCaptivePortalDetector, ""}
188 }; 188 };
189 189
190 const Experiment::Choice kAshInternalDisplayUIScaleChoices[] = {
191 { IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_DEFAULT, "", "" },
192 { IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_80,
193 ash::switches::kAshInternalDisplayUIScale, "0.8"},
194 { IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_125,
195 ash::switches::kAshInternalDisplayUIScale, "1.25"},
196 { IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_150,
197 ash::switches::kAshInternalDisplayUIScale, "1.5"},
198 };
199
200 #endif 190 #endif
201 191
202 const Experiment::Choice kImplSidePaintingChoices[] = { 192 const Experiment::Choice kImplSidePaintingChoices[] = {
203 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 193 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
204 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 194 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
205 cc::switches::kEnableImplSidePainting, ""}, 195 cc::switches::kEnableImplSidePainting, ""},
206 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 196 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
207 cc::switches::kDisableImplSidePainting, ""} 197 cc::switches::kDisableImplSidePainting, ""}
208 }; 198 };
209 199
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 kOsCrOS, 992 kOsCrOS,
1003 SINGLE_VALUE_TYPE(switches::kEnableAppMode), 993 SINGLE_VALUE_TYPE(switches::kEnableAppMode),
1004 }, 994 },
1005 { 995 {
1006 "force-fullscreen-app", 996 "force-fullscreen-app",
1007 IDS_FLAGS_FORCE_FULLSCREEN_APP_NAME, 997 IDS_FLAGS_FORCE_FULLSCREEN_APP_NAME,
1008 IDS_FLAGS_FORCE_FULLSCREEN_APP_DESCRIPTION, 998 IDS_FLAGS_FORCE_FULLSCREEN_APP_DESCRIPTION,
1009 kOsCrOS, 999 kOsCrOS,
1010 SINGLE_VALUE_TYPE(switches::kForceFullscreenApp), 1000 SINGLE_VALUE_TYPE(switches::kForceFullscreenApp),
1011 }, 1001 },
1012 {
1013 "ash-internal-display-ui-scale",
1014 IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_NAME,
1015 IDS_FLAGS_ASH_INTERNAL_DISPLAY_SCALE_DESCRIPTION,
1016 kOsCrOS,
1017 MULTI_VALUE_TYPE(kAshInternalDisplayUIScaleChoices)
1018 },
1019 #endif // defined(OS_CHROMEOS) 1002 #endif // defined(OS_CHROMEOS)
1020 { 1003 {
1021 "views-textfield", 1004 "views-textfield",
1022 IDS_FLAGS_VIEWS_TEXTFIELD_NAME, 1005 IDS_FLAGS_VIEWS_TEXTFIELD_NAME,
1023 IDS_FLAGS_VIEWS_TEXTFIELD_DESCRIPTION, 1006 IDS_FLAGS_VIEWS_TEXTFIELD_DESCRIPTION,
1024 kOsWin, 1007 kOsWin,
1025 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableViewsTextfield, 1008 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableViewsTextfield,
1026 switches::kDisableViewsTextfield), 1009 switches::kDisableViewsTextfield),
1027 }, 1010 },
1028 { 1011 {
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 } 1731 }
1749 1732
1750 const Experiment* GetExperiments(size_t* count) { 1733 const Experiment* GetExperiments(size_t* count) {
1751 *count = num_experiments; 1734 *count = num_experiments;
1752 return experiments; 1735 return experiments;
1753 } 1736 }
1754 1737
1755 } // namespace testing 1738 } // namespace testing
1756 1739
1757 } // namespace about_flags 1740 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698