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

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

Issue 113373002: Unrevert r245135 "Created new Windows LevelDB environment." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
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 10 matching lines...) Expand all
21 #include "chrome/browser/flags_storage.h" 21 #include "chrome/browser/flags_storage.h"
22 #include "chrome/common/chrome_content_client.h" 22 #include "chrome/common/chrome_content_client.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "components/nacl/common/nacl_switches.h" 24 #include "components/nacl/common/nacl_switches.h"
25 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
26 #include "extensions/common/switches.h" 26 #include "extensions/common/switches.h"
27 #include "grit/chromium_strings.h" 27 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "grit/google_chrome_strings.h" 29 #include "grit/google_chrome_strings.h"
30 #include "media/base/media_switches.h" 30 #include "media/base/media_switches.h"
31 #include "third_party/leveldatabase/leveldb_switches.h"
31 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/ui_base_switches.h" 33 #include "ui/base/ui_base_switches.h"
33 #include "ui/compositor/compositor_switches.h" 34 #include "ui/compositor/compositor_switches.h"
34 #include "ui/events/event_switches.h" 35 #include "ui/events/event_switches.h"
35 #include "ui/gfx/switches.h" 36 #include "ui/gfx/switches.h"
36 #include "ui/gl/gl_switches.h" 37 #include "ui/gl/gl_switches.h"
37 #include "ui/keyboard/keyboard_switches.h" 38 #include "ui/keyboard/keyboard_switches.h"
38 #include "ui/message_center/message_center_switches.h" 39 #include "ui/message_center/message_center_switches.h"
39 #include "ui/surface/surface_switches.h" 40 #include "ui/surface/surface_switches.h"
40 #include "ui/views/views_switches.h" 41 #include "ui/views/views_switches.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 const Experiment::Choice kTouchOptimizedUIChoices[] = { 176 const Experiment::Choice kTouchOptimizedUIChoices[] = {
176 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 177 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
177 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 178 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
178 switches::kTouchOptimizedUI, 179 switches::kTouchOptimizedUI,
179 switches::kTouchOptimizedUIEnabled }, 180 switches::kTouchOptimizedUIEnabled },
180 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 181 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
181 switches::kTouchOptimizedUI, 182 switches::kTouchOptimizedUI,
182 switches::kTouchOptimizedUIDisabled } 183 switches::kTouchOptimizedUIDisabled }
183 }; 184 };
184 185
186 const Experiment::Choice kLevelDbEnvTypeChoices[] = {
187 { IDS_FLAGS_LEVELDB_ENV_TYPE_CHOICE_DEFAULT, "", "" },
188 { IDS_FLAGS_LEVELDB_ENV_TYPE_CHOICE_POSIX,
189 switches::kLevelDbEnv,
190 switches::kLevelDbEnvPosix },
191 { IDS_FLAGS_LEVELDB_ENV_TYPE_CHOICE_WIN32,
192 switches::kLevelDbEnv,
193 switches::kLevelDbEnvWin32 }
194 };
195
185 const Experiment::Choice kNaClDebugMaskChoices[] = { 196 const Experiment::Choice kNaClDebugMaskChoices[] = {
186 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 197 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
187 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by 198 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
188 // debug stub to a remote machine. Since secure shell uses NaCl, we provide 199 // debug stub to a remote machine. Since secure shell uses NaCl, we provide
189 // an option to switch off its debugging. 200 // an option to switch off its debugging.
190 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, 201 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS,
191 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, 202 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" },
192 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, 203 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
193 switches::kNaClDebugMask, "*://*/*debug.nmf" } 204 switches::kNaClDebugMask, "*://*/*debug.nmf" }
194 }; 205 };
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect) 977 SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect)
967 }, 978 },
968 { 979 {
969 "enable-scroll-prediction", 980 "enable-scroll-prediction",
970 IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME, 981 IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME,
971 IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION, 982 IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION,
972 kOsDesktop, 983 kOsDesktop,
973 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction) 984 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)
974 }, 985 },
975 { 986 {
987 "leveldb-env",
988 IDS_FLAGS_LEVELDB_ENV_TYPE_NAME,
989 IDS_FLAGS_LEVELDB_ENV_TYPE_DESCRIPTION,
990 kOsWin,
991 MULTI_VALUE_TYPE(kLevelDbEnvTypeChoices)
992 },
993 {
976 "touch-events", 994 "touch-events",
977 IDS_TOUCH_EVENTS_NAME, 995 IDS_TOUCH_EVENTS_NAME,
978 IDS_TOUCH_EVENTS_DESCRIPTION, 996 IDS_TOUCH_EVENTS_DESCRIPTION,
979 kOsDesktop, 997 kOsDesktop,
980 MULTI_VALUE_TYPE(kTouchEventsChoices) 998 MULTI_VALUE_TYPE(kTouchEventsChoices)
981 }, 999 },
982 { 1000 {
983 "touch-optimized-ui", 1001 "touch-optimized-ui",
984 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME, 1002 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME,
985 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION, 1003 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION,
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
2416 } 2434 }
2417 2435
2418 const Experiment* GetExperiments(size_t* count) { 2436 const Experiment* GetExperiments(size_t* count) {
2419 *count = num_experiments; 2437 *count = num_experiments;
2420 return experiments; 2438 return experiments;
2421 } 2439 }
2422 2440
2423 } // namespace testing 2441 } // namespace testing
2424 2442
2425 } // namespace about_flags 2443 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698